misc minor changes

diff --git a/Debian/Debhelper/Buildsystem.pm b/Debian/Debhelper/Buildsystem.pm
index 3ee37a5f84e1686de558ff858cbbf7005958356c..c63f8153b5358457f7d59c7dfea7965e3933d39e 100644 (file)
--- a/Debian/Debhelper/Buildsystem.pm
+++ b/Debian/Debhelper/Buildsystem.pm
@@ -91,16 +91,16 @@ sub _set_builddir {
        }
 }
 
-# This instance method is called to check if the build system is capable
+# This instance method is called to check if the build system is able
 # to auto build a source package. Additional argument $step describes
 # which operation the caller is going to perform (either configure,
 # build, test, install or clean). You must override this method for the
 # build system module to be ever picked up automatically. This method is
 # used in conjuction with @Dh_Buildsystems::BUILDSYSTEMS.
 #
-# This method is supposed to be called with source root directory being
-# working directory. Use $this->get_buildpath($path) method to get full
-# path to the files in the build directory.
+# This method is supposed to be called inside the source root directory.
+# Use $this->get_buildpath($path) method to get full path to the files
+# in the build directory.
 sub check_auto_buildable {
        my $this=shift;
        my ($step) = @_;
@@ -257,7 +257,7 @@ sub _cd {
        }
 }
 
-# Changes working directory to the source directory (if needed)
+# Changes working directory to the source directory (if needed),
 # calls doit(@_) and changes working directory back to the top
 # directory.
 sub doit_in_sourcedir {
@@ -374,4 +374,4 @@ sub clean {
        my $this=shift;
 }
 
-1;
+1

diff --git a/Debian/Debhelper/Buildsystem/autoconf.pm b/Debian/Debhelper/Buildsystem/autoconf.pm
index 60fa9e8511dd3a0ef9905f2b99ac1f8d6069a454..7229fc718e866a61a992f5f6b6509dc68917da40 100644 (file)
--- a/Debian/Debhelper/Buildsystem/autoconf.pm
+++ b/Debian/Debhelper/Buildsystem/autoconf.pm
@@ -52,4 +52,4 @@ sub configure {
        $this->doit_in_builddir($this->get_source_rel2builddir("configure"), @opts, @_);
 }
 
-1;
+1

diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index 5662874089c2c51944839be361503a24b886a694..fe97f77267040f71ec6ebe7d85d657fec3b1efb9 100644 (file)
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@ -42,4 +42,4 @@ sub configure {
        $this->doit_in_builddir("cmake", $this->get_source_rel2builddir(), @flags);
 }
 
-1;
+1

diff --git a/Debian/Debhelper/Buildsystem/makefile.pm b/Debian/Debhelper/Buildsystem/makefile.pm
index d84d3349bad49a96dd06811f0904016a7365e5ab..3809d594705f077d3bb3f05879e396d679d9642e 100644 (file)
--- a/Debian/Debhelper/Buildsystem/makefile.pm
+++ b/Debian/Debhelper/Buildsystem/makefile.pm
@@ -92,4 +92,4 @@ sub clean {
        }
 }
 
-1;
+1

diff --git a/Debian/Debhelper/Buildsystem/perl_build.pm b/Debian/Debhelper/Buildsystem/perl_build.pm
index 3567cb1a7386c56818e313555d75f96473609bfb..caba9b75f8cdab2bd0848aaa6fbdb6b669707b88 100644 (file)
--- a/Debian/Debhelper/Buildsystem/perl_build.pm
+++ b/Debian/Debhelper/Buildsystem/perl_build.pm
@@ -64,4 +64,4 @@ sub clean {
        $this->do_perl("Build", "--allow_mb_mismatch", 1, "distclean", @_);
 }
 
-1;
+1

diff --git a/Debian/Debhelper/Buildsystem/perl_makemaker.pm b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
index 07a827ac259914c13c0f94ca304efc02a7b6f8c8..702458c5a6e42f258679a2e88c70a7c384826e6c 100644 (file)
--- a/Debian/Debhelper/Buildsystem/perl_makemaker.pm
+++ b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
@@ -61,4 +61,4 @@ sub install {
        $this->SUPER::install($destdir, "PREFIX=/usr", @_);
 }
 
-1;
+1

diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm
index 39a4466ad58c8ce034c5038b9ad473a7234a01db..fce45135771a702cec995fc4aa8462e1b3b79dd1 100644 (file)
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -111,4 +111,4 @@ sub clean {
        $this->doit_in_sourcedir('find', '.', '-name', '*.pyc', '-exec', 'rm', '{}', ';');
 }
 
-1;
+1

diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index d37c593d48e4ed0fe08d0178dc980a4512b78080..64ec18a4e924dfa1807f740d71976ec9cdba1b53 100644 (file)
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -87,7 +87,7 @@ sub load_all_buildsystems {
                }
        }
 
-       # Push standard debhelper build systems first
+       # Standard debhelper build systems first
        for my $name (@BUILDSYSTEMS) {
                error("standard debhelper build system '$name' could not be found/loaded")
                    if not exists $buildsystems{$name};
@@ -131,8 +131,7 @@ sub buildsystems_list {
 
        # List build systems (including auto and specified status)
        my ($auto, $specified);
-       my @buildsystems = load_all_buildsystems();
-       for my $inst (@buildsystems) {
+       for my $inst (load_all_buildsystems()) {
                my $is_specified = defined $opt_buildsys && $opt_buildsys eq $inst->NAME();
                if (! defined $specified && defined $opt_buildsys && $opt_buildsys eq $inst->NAME()) {
                        $specified = $inst->NAME();
@@ -177,4 +176,4 @@ sub buildsystems_do {
        return 0;
 }
 
-1;
+1

diff --git a/doc/PROGRAMMING b/doc/PROGRAMMING
index f338b5779e9dfaa4151cc8ec886f5534ec40d349..450511e3885509cce8551827a5a72e07f2a85f7c 100644 (file)
--- a/doc/PROGRAMMING
+++ b/doc/PROGRAMMING
@@ -275,7 +275,8 @@ classes.
 
 A buildsystem class needs to inherit or define these methods: DESCRIPTION,
 check_auto_buildable, build, test, install, clean. See the comments
-inside Debian::Debhelper::Buildsystem for details.
+inside Debian::Debhelper::Buildsystem for details. Note that this interface
+is still subject to change.
 
 Note that third-party buildsystems will not automatically be used by default,
 but can be forced to be used via the --buildsystem parameter.