summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-06-26 09:10:52 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-06-26 09:10:52 -0400
commit8df0a67a2089bfb0af86a6ec7be5d017e610bfee (patch)
tree32bd0274f142858753d0cd38652eeef1332d063c
parent596a99831d28a97e0c2c5406ca72e29fc3e4a37f (diff)
parent141b5cea6a5ab4efee9d0994b84b88ac2e4c5bf5 (diff)
Merge commit 'remotes/modestas/buildsystems' into buildsystems
-rw-r--r--Debian/Debhelper/Buildsystem/python_distutils.pm2
-rw-r--r--Debian/Debhelper/Dh_Buildsystems.pm4
-rw-r--r--dh_auto.pod6
3 files changed, 6 insertions, 6 deletions
diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm
index 8266fa0..5a04d4e 100644
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -70,7 +70,7 @@ sub not_our_cfg {
my $ret;
if (open(my $cfg, $this->get_buildpath(".pydistutils.cfg"))) {
$ret = not "# Created by dh_auto\n" eq <$cfg>;
- close DISTUTILSCFG;
+ close $cfg;
}
return $ret;
}
diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index df81020..3b150bd 100644
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -88,9 +88,9 @@ sub load_all_buildsystems {
}
}
- # Push debhelper built-in build systems first
+ # Push standard debhelper build systems first
for my $name (@BUILDSYSTEMS) {
- error("debhelper built-in build system '$name' could not be found/loaded")
+ error("standard debhelper build system '$name' could not be found/loaded")
if not exists $buildsystems{$name};
push @buildsystems, $buildsystems{$name};
delete $buildsystems{$name};
diff --git a/dh_auto.pod b/dh_auto.pod
index 6eb244f..c8398b5 100644
--- a/dh_auto.pod
+++ b/dh_auto.pod
@@ -118,7 +118,7 @@ in the external package. The only limitation is that support for it can only be
enabled manually (via "Manual build system selection"). Their auto-selection is
not allowed in order to keep the process stable under various system
configurations (i.e. when different sets of third party debhelper build systems
-are installed). However, the user can always discover all default and third
+are installed). However, the user can always discover all standard and third
party debhelper build systems supported on the system by passing the L<--list>
option to any dh_auto program.
@@ -186,7 +186,7 @@ directory path.
=item B<--list>, B<-l>
List all debhelper build systems available on this system and exit. The list
-includes both default (listed first in the auto-selection order) and third
+includes both standard (listed first in the auto-selection order) and third
party build systems (clearly marked as such). The list is concluded with the
information about which build system would be auto-selected to complete the
building step or which one is manually specified with the I<--buildsystem>
@@ -216,7 +216,7 @@ L<debhelper(7)>
=over 2
-=item B<Default debhelper build systems>
+=item B<Standard debhelper build systems>
#BUILD SYSTEM MAN LIST#