minor coding stlye

[debhelper.git] / dh

diff --git a/dh b/dh
index efb3b51b6cb9d78d961838db49524c2781ce6149..ab7ddb07884b54788a11f8b7197ec8e1c9949b3f 100755 (executable)
--- a/dh
+++ b/dh
@@ -39,7 +39,7 @@ then when it gets to that command in the sequence, dh will run that
 target from the rules file, rather than running the actual command. The
 override target can then run the command with additional options, or run
 entirely different commands instead. (Note that to use this feature,
-you should Build-Depend on debhelper 7.2 or above.)
+you should Build-Depend on debhelper 7.0.50 or above.)
 
 =head1 OPTIONS
 
@@ -187,7 +187,7 @@ default. This is how to use dh_pycentral instead.
 
        #!/usr/bin/make -f
        %:
-               dh --with python-central
+               dh --with python-central $@
 
 =cut
 
@@ -249,6 +249,7 @@ $sequences{install} = [@{$sequences{build}}, qw{
        dh_installudev
        dh_installwm
        dh_installxfonts
+       dh_bugfiles
        dh_lintian
        dh_desktop
        dh_gconf
@@ -375,7 +376,7 @@ while (@ARGV_orig) {
 my %logged;
 my %startpoint;
 foreach my $package (@packages) {
-       my @log=loadlog($package);
+       my @log=load_log($package, \%logged);
        if ($dh{AFTER}) {
                # Run commands in the sequence that come after the
                # specified command.
@@ -442,6 +443,10 @@ sub run {
        my @exclude=@{shift()};
        my @options=@_;
        
+       # If some packages are excluded, add flags
+       # to prevent them from being acted on.
+       push @options, map { "-N$_" } @exclude;
+
        # Check for override targets in debian/rules and
        # run them instead of running the command directly.
        my $override_command;
@@ -453,11 +458,6 @@ sub run {
                $command="debian/rules";
                @options="override_".$override_command;
        }
-       else {
-               # If some packages are excluded, add flags
-               # to prevent them from being acted on.
-               push @options, map { "-N$_" } @exclude;
-       }
 
        # 3 space indent lines the command being run up under the 
        # sequence name after "dh ".
@@ -484,21 +484,6 @@ sub run {
        }
 }
 
-sub loadlog {
-       my $package=shift;
-       my $ext=pkgext($package);
-       
-       my @log;
-       open(LOG, "<", "debian/${ext}debhelper.log") || return;
-       while (<LOG>) {
-               chomp;
-               push @log, $_;
-               $logged{$package}{$_}=1;
-       }
-       close LOG;
-       return @log;
-}
-
 sub writelog {
        Debian::Debhelper::Dh_Lib::write_log(@_);
 }
@@ -515,7 +500,7 @@ sub rules_explicit_target {
        if (! $rules_parsed) {  
                my $processing_targets = 0;
                my $not_a_target = 0;
-               open(MAKE, "make -Rrnpsf debian/rules debhelper-fail-me 2>/dev/null |");
+               open(MAKE, "LC_ALL=C make -Rrnpsf debian/rules debhelper-fail-me 2>/dev/null |");
                while (<MAKE>) {
                        if ($processing_targets) {
                                if (/^# Not a target:/) {