Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg

ChangeLog

@@ -1,3 +1,14 @@
+2007-09-20  Frank Lichtenheld  <djpig@debian.org>
+
+	* scripts/dpkg-sources.pl (version): Don't use
+	printf if we don't need it, use print instead.
+
+	* scripts/dpkg-buildpackage.sh (usage): Fix typo
+	s/dpkg-genchangs/dpkg-genchanges/
+
+	* scripts/Dpkg.pm: Make the regex for determining
+	$progname more robust.
+
 2007-09-18  Guillem Jover  <guillem@debian.org>
 
 	* lib/mlib.c (checksubprocerr): Warn instead of erroring out in case

scripts/Dpkg.pm

@@ -6,7 +6,7 @@ use warnings;
 use base qw(Exporter);
 our @EXPORT = qw($version $progname $admindir $dpkglibdir $pkgdatadir);
 
-our ($progname) = $0 =~ m:.*/(.*):;
+our ($progname) = $0 =~ m#(?:.*/)?([^/]*)#;
 
 # The following lines are automatically fixed at install time
 our $version = "1.14";

scripts/dpkg-buildpackage.sh

@@ -40,7 +40,7 @@ Options:
   -v<version>    changes since version <version>.      }
   -m<maint>      maintainer for package is <maint>.    }
   -e<maint>      maintainer for release is <maint>.    } only passed
-  -C<descfile>   changes are described in <descfile>.  } to dpkg-genchangs
+  -C<descfile>   changes are described in <descfile>.  } to dpkg-genchanges
   -si (default)  src includes orig for rev. 0 or 1.    }
   -sa            uploaded src always includes orig.    }
   -sd            uploaded src is diff and .dsc only.   }

scripts/dpkg-source.pl

@@ -97,10 +97,10 @@ $SIG{'QUIT'} = \&exit_handler;
 sub version {
     printf _g("Debian %s version %s.\n"), $progname, $version;
 
-    printf _g("
+    print _g("
 Copyright (C) 1996 Ian Jackson and Klee Dienes.");
 
-    printf _g("
+    print _g("
 This is free software; see the GNU General Public Licence version 2 or
 later for copying conditions. There is NO warranty.
 ");