r117: Initial Import

diff --git a/Dh_Lib.pm b/Dh_Lib.pm
index 00f281321bab608d1c6427871cfa3c1131e6d0ea..e707032615df09281f71db94561ad47832dd069f 100644 (file)
--- a/Dh_Lib.pm
+++ b/Dh_Lib.pm
@@ -131,12 +131,11 @@ sub error { my $message=shift;
 
 # Output a warning.
 sub warning { my $message=shift;
-       print STDERR basename().": $message\n";
+       print STDERR basename($0).": $message\n";
 }
 
-# Returns the basename of the program.
-sub basename {
-       my $fn=$0;
+# Returns the basename of the argument passed to it.
+sub basename { my $fn=shift;
        $fn=~s:.*/(.*?):$1:;
        return $fn;
 }
@@ -241,7 +240,7 @@ sub autoscript { my $package=shift; my $script=shift; my $filename=shift; my $se
        }
 
        # TODO: do this in perl, perhaps?
-       complex_doit("echo \"# Automatically added by ".basename().">> $outfile");
+       complex_doit("echo \"# Automatically added by ".basename($0).">> $outfile");
        complex_doit("sed \"$sed\" $infile >> $outfile");
        complex_doit("echo '# End automatically added section' >> $outfile");
 }

diff --git a/debian/changelog b/debian/changelog
index b124f13808193f3afe5b98960a756cb6ef8c36f5..314ea71e5ca1b39d60c0ab0a428aebf5bcd8447d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (1.1.11) unstable; urgency=low
+
+  * dh_installchangelogs: added -k flag, that will make it install a symlink
+    to the original name of the upstream changelog.
+
+ -- Joey Hess <joeyh@master.debian.org>  Thu, 20 Aug 1998 15:40:40 -0700
+
 debhelper (1.1.10) unstable; urgency=low
 
   * It's come to my attention that a few packages use filename globbing in