Standarize scripts usage output format and at the same time make

the strings easier for the translators. Add '--help' and '--version'
for most of the scripts. Print the usage and version to stdout.

20 files changed, 1201 insertions, 955 deletions

diff --git a/scripts/changelog/debian.pl b/scripts/changelog/debian.pl
index 4194403f0..957b6dae7 100755
--- a/scripts/changelog/debian.pl
+++ b/scripts/changelog/debian.pl
@@ -22,22 +22,36 @@ $progname= "parsechangelog/$progname";
 
 $since='';
 
-sub usageversion {
-    print STDERR _g(
-"Debian %s %s.  Copyright (C) 1996
-Ian Jackson.  This is free software; see the GNU General Public Licence
-version 2 or later for copying conditions.  There is NO warranty.
-
-Usage: %s [-v<versionsince>] | -h
-"), $progname, $version, $progname;
+sub version {
+    printf _g("Debian %s version %s.\n"), $progname, $version;
+
+    printf _g("
+Copyright (C) 1996 Ian Jackson.");
+    printf _g("
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO warranty.
+");
+}
+
+sub usage {
+    printf _g(
+"Usage: %s [<option>]
+
+Options:
+  -v<versionsince>    print changes since <versionsince>.
+  -h, --help          print this help message.
+      --version       print program version.
+"), $progname;
 }
 
 while (@ARGV) {
     $_=shift(@ARGV);
     if (m/^-v(.+)$/) {
         $since= $1;
-    } elsif (m/^-h$/) {
-        &usageversion; exit(0);
+    } elsif (m/^-(h|-help)$/) {
+        &usage; exit(0);
+    } elsif (m/^--version$/) {
+        &version; exit(0);
     } else {
         &usageerr(sprintf(_g("unknown option or argument \`%s'"), $_));
     }
diff --git a/scripts/cleanup-info.pl b/scripts/cleanup-info.pl
index 86e5923f9..101f7dd0b 100755
--- a/scripts/cleanup-info.pl
+++ b/scripts/cleanup-info.pl
@@ -29,20 +29,31 @@ push(@INC,$dpkglibdir);
 require 'dpkg-gettext.pl';
 textdomain("dpkg");
 
+($0) = $0 =~ m:.*/(.+):;
+
 my $version = '1.1.6'; # This line modified by Makefile
 sub version {
-    printf STDERR _g(<<END), $version;
-Debian cleanup-info %s.  Copyright (C)1996 Kim-Minh Kaplan.
-This is free software; see the GNU General Public Licence
-version 2 or later for copying conditions.  There is NO warranty.
-END
+    printf _g("Debian %s version %s.\n"), $0, $version;
+
+    printf _g("
+Copyright (C) 1996 Kim-Minh Kaplan.");
+
+    printf _g("
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO warranty.
+");
 }
 
 sub usage {
-    print STDERR _g(<<'EOF');
-usage: cleanup-info [--version] [--help] [--unsafe] [--] [<dirname>]
-Warning: the ``--unsafe'' option may garble an otherwise correct file
-EOF
+    printf _g(
+"Usage: %s [<option> ...] [--] [<dirname>]
+
+Options:
+  --unsafe     set some additional possibly useful options.
+               warning: this option may garble an otherwise correct file.
+  --help       show this help message.
+  --version    show the version.
+"), $0;
 }
 
 my $infodir = '/usr/info';
diff --git a/scripts/controllib.pl b/scripts/controllib.pl
index 35f41837e..6869008d7 100755
--- a/scripts/controllib.pl
+++ b/scripts/controllib.pl
@@ -413,7 +413,7 @@ sub syserr { die sprintf(_g("%s: failure: %s: %s"), $progname, $_[0], $!)."\n";
 sub error { die sprintf(_g("%s: error: %s"), $progname, $_[0])."\n"; }
 sub internerr { die sprintf(_g("%s: internal error: %s"), $progname, $_[0])."\n"; }
 sub warn { if (!$quiet_warnings) { warn sprintf(_g("%s: warning: %s"), $progname, $_[0])."\n"; } }
-sub usageerr { printf(STDERR _g("%s: %s")."\n\n", $progname, "@_"); &usageversion; exit(2); }
+sub usageerr { printf(STDERR _g("%s: %s")."\n\n", $progname, "@_"); &usage; exit(2); }
 sub warnerror { if ($warnable_error) { &warn( @_ ); } else { &error( @_ ); } }
 
 sub subprocerr {
diff --git a/scripts/dpkg-architecture.pl b/scripts/dpkg-architecture.pl
index 2872daac7..7fd912952 100755
--- a/scripts/dpkg-architecture.pl
+++ b/scripts/dpkg-architecture.pl
@@ -20,7 +20,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 
 $version="1.0.0"; # This line modified by Makefile
-$0 = `basename $0`; chomp $0;
 
 $dpkglibdir="/usr/lib/dpkg";
 push(@INC,$dpkglibdir);
@@ -31,30 +30,40 @@ textdomain("dpkg-dev");
 
 $pkgdatadir=".";
 
-sub usageversion {
-    printf STDERR _g(
-"Debian %s %s.
-Copyright (C) 2004-2005 Scott James Remnant <scott\@netsplit.com>,
+sub version {
+    printf _g("Debian %s version %s.\n"), $progname, $version;
+
+    printf _g("
 Copyright (C) 1999-2001 Marcus Brinkmann <brinkmd\@debian.org>.
-This is free software; see the GNU General Public Licence
-version 2 or later for copying conditions.  There is NO warranty.
+Copyright (C) 2004-2005 Scott James Remnant <scott\@netsplit.com>.");
+
+    printf _g("
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO warranty.
+");
+}
+
+sub usage {
+    printf _g(
+"Usage: %s [<option> ...] [<action>]
 
-Usage:
-  %s [<option> ...] [<action>]
 Options:
-       -a<debian-arch>    set current Debian architecture
-       -t<gnu-system>     set current GNU system type
-       -L                 list valid architectures
-       -f                 force flag (override variables set in environment)
+  -a<debian-arch>    set current Debian architecture.
+  -t<gnu-system>     set current GNU system type.
+  -L                 list valid architectures.
+  -f                 force flag (override variables set in environment).
+
 Actions:
-       -l                 list variables (default)
-       -e<debian-arch>    compare with current Debian architecture
-       -i<arch-alias>     check if current Debian architecture is <arch-alias>
-       -q<variable>       prints only the value of <variable>.
-       -s                 print command to set environment variables
-       -u                 print command to unset environment variables
-       -c <command>       set environment and run the command in it.
-"), $0, $version, $0;
+  -l                 list variables (default).
+  -e<debian-arch>    compare with current Debian architecture.
+  -i<arch-alias>     check if current Debian architecture is <arch-alias>.
+  -q<variable>       prints only the value of <variable>.
+  -s                 print command to set environment variables.
+  -u                 print command to unset environment variables.
+  -c <command>       set environment and run the command in it.
+  --help             show this help message.
+  --version          show the version.
+"), $progname;
 }
 
 sub read_cputable {
@@ -209,6 +218,12 @@ while (@ARGV) {
        last;
     } elsif (m/^-L$/) {
        # Handled already
+    } elsif (m/^-(h|-help)$/) {
+       &usage;
+       exit 0;
+    } elsif (m/^--version$/) {
+       &version;
+       exit 0;
     } else {
 	usageerr(sprintf(_g("unknown option \`%s'"), $_));
     }
diff --git a/scripts/dpkg-buildpackage.sh b/scripts/dpkg-buildpackage.sh
index c00f91f13..be865cdf6 100755
--- a/scripts/dpkg-buildpackage.sh
+++ b/scripts/dpkg-buildpackage.sh
@@ -5,46 +5,54 @@ set -e
 version="1.10.10"; # This line modified by Makefile
 
 progname="`basename \"$0\"`"
-usageversion () {
-	cat >&2 <<END
-Debian dpkg-buildpackage $version.  
+
+showversion () {
+	echo "Debian $progname version $version."
+
+	echo "
 Copyright (C) 1996 Ian Jackson.
 Copyright (C) 2000 Wichert Akkerman
-This is free software; see the GNU General Public Licence version 2
-or later for copying conditions.  There is NO warranty.
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO warranty."
+}
+
+usage () {
+	cat <<END
+Usage: $progname [<options> ...]
 
-Usage: dpkg-buildpackage [options]
-Options: -r<gain-root-command>
-         -p<sign-command>
-	 -d            do not check build dependencies and conflicts
-	 -D            check build dependencies and conflicts
-	 -k<keyid>     the key to use for signing
-         -sgpg         the sign-command is called like GPG
-         -spgp         the sign-command is called like PGP 
-         -us           unsigned source
-         -uc           unsigned changes
-         -a<arch>      Debian architecture we build for (implies -d)
-         -b            binary-only, do not build source } also passed to
-         -B            binary-only, no arch-indep files } dpkg-genchanges
-         -S            source only, no binary files     } 
-         -t<system>    set GNU system type  } passed to dpkg-architecture
-         -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-
-         -si (default) src includes orig for rev. 0 or 1    } genchanges
-         -sa           uploaded src always includes orig    }
-         -sd           uploaded src is diff and .dsc only   }
-         -sn           force Debian native source format } only passed
-         -s[sAkurKUR]  see dpkg-source for explanation   } to dpkg-source
-         -nc           do not clean source tree (implies -b)
-         -tc           clean source tree when finished
-         -ap           add pause before starting signature process
-         -h            print this message
-         -W            Turn certain errors into warnings.      } passed to
-         -E            When -W is turned on, -E turned it off. } dpkg-source
-         -i[<regex>]   ignore diffs of files matching regex    } only passed
-         -I<filename>  filter out files when building tarballs } to dpkg-source
+Options:
+  -r<gain-root-command>
+  -p<sign-command>
+  -d             do not check build dependencies and conflicts.
+  -D             check build dependencies and conflicts.
+  -k<keyid>      the key to use for signing.
+  -sgpg          the sign-command is called like GPG.
+  -spgp          the sign-command is called like PGP.
+  -us            unsigned source.
+  -uc            unsigned changes.
+  -a<arch>       Debian architecture we build for (implies -d).
+  -b             binary-only, do not build source. } also passed to
+  -B             binary-only, no arch-indep files. } dpkg-genchanges
+  -S             source only, no binary files.     }
+  -t<system>     set GNU system type.           } passed to dpkg-architecture
+  -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
+  -si (default)  src includes orig for rev. 0 or 1.    }
+  -sa            uploaded src always includes orig.    }
+  -sd            uploaded src is diff and .dsc only.   }
+  -sn            force Debian native source format.      } only passed
+  -s[sAkurKUR]   see dpkg-source for explanation.        } to dpkg-source
+  -nc            do not clean source tree (implies -b).
+  -tc            clean source tree when finished.
+  -ap            add pause before starting signature process.
+  -W             turn certain errors into warnings.       } passed to
+  -E             when -W is turned on, -E turned it off.  } dpkg-source
+  -i[<regex>]    ignore diffs of files matching regex.    } only passed
+  -I<filename>   filter out files when building tarballs. } to dpkg-source
+  -h, --help     show this help message.
+      --version  show the version.
 END
 }
 
@@ -64,7 +72,7 @@ checkbuilddep=true
 checkbuilddep_args=''
 binarytarget=binary
 sourcestyle=''
-version=''
+changesversion=''
 since=''
 maint=''
 desc=''
@@ -77,7 +85,10 @@ while [ $# != 0 ]
 do
 	value="`echo x\"$1\" | sed -e 's/^x-.//'`"
 	case "$1" in
-	-h)	usageversion; exit 0 ;;
+	-h|--help)
+		usage; exit 0 ;;
+	--version)
+		showversion; exit 0 ;;
 	-r*)	rootcommand="$value" ;;
 	-p*)	signcommand="$value" ;;
 	-k*)	signkey="$value" ;;
@@ -111,7 +122,7 @@ do
 	-W)	warnable_error=1; passopts="$passopts -W";;
 	-E)	warnable_error=0; passopts="$passopts -E";;
 	*)	echo >&2 "$progname: unknown option or argument $1"
-		usageversion; exit 2 ;;
+		usage; exit 2 ;;
 	esac
 	shift
 done
@@ -145,7 +156,7 @@ mustsetvar () {
 curd="`pwd`"
 dirn="`basename \"$curd\"`"
 mustsetvar package "`dpkg-parsechangelog | sed -n 's/^Source: //p'`" "source package is"
-mustsetvar version "`dpkg-parsechangelog | sed -n 's/^Version: //p'`" "source version is"
+mustsetvar changesversion "`dpkg-parsechangelog | sed -n 's/^Version: //p'`" "source version is"
 if [ -n "$changedby" ]; then maintainer="$changedby";
 elif [ -n "$maint" ]; then maintainer="$maint";
 else mustsetvar maintainer "`dpkg-parsechangelog | sed -n 's/^Maintainer: //p'`" "source changed by"; fi
@@ -156,7 +167,7 @@ if [ x$sourceonly = x ]; then
 else
 	arch=source
 fi
-mustsetvar sversion "`echo \"$version\" | perl -pe 's/^\d+://'`" "source version without epoch"
+mustsetvar sversion "`echo \"$changesversion\" | perl -pe 's/^\d+://'`" "source version without epoch"
 pv="${package}_${sversion}"
 pva="${package}_${sversion}_${arch}"
 
diff --git a/scripts/dpkg-checkbuilddeps.pl b/scripts/dpkg-checkbuilddeps.pl
index 0ef20d486..290b19426 100755
--- a/scripts/dpkg-checkbuilddeps.pl
+++ b/scripts/dpkg-checkbuilddeps.pl
@@ -13,15 +13,16 @@ require 'dpkg-gettext.pl';
 textdomain("dpkg-dev");
 
 sub usage {
-	print STDERR _g(<<EOF);
-Usage: dpkg-checkbuilddeps [-B] [control-file]
-	-B		binary-only, ignore -Indep
-	control-file	control file to process [Default: debian/control]
-EOF
+	printf _g(
+"Usage: %s [<option> ...] [<control-file>]
+
+Options:
+  control-file   control file to process (default: debian/control).
+  -B             binary-only, ignore -Indep.
+  -h             show this help message.
+"), $progname;
 }
 
-my ($me)=$0=~m:.*/(.+):;
-
 my $binary_only=0;
 my $want_help=0;
 if (! GetOptions('-B' => \$binary_only,
@@ -65,11 +66,11 @@ if (! $binary_only && defined($fi{"C Build-Conflicts-Indep"})) {
 }
 
 if (@unmet) {
-	printf STDERR _g("%s: Unmet build dependencies: "), $me;
+	printf STDERR _g("%s: Unmet build dependencies: "), $progname;
 	print STDERR join(" ", @unmet), "\n";
 }
 if (@conflicts) {
-	printf STDERR _g("%s: Build conflicts: "), $me;
+	printf STDERR _g("%s: Build conflicts: "), $progname;
 	print STDERR join(" ", @conflicts), "\n";
 }
 exit 1 if @unmet || @conflicts;
diff --git a/scripts/dpkg-distaddfile.pl b/scripts/dpkg-distaddfile.pl
index 1bb695758..cd82b8b5d 100755
--- a/scripts/dpkg-distaddfile.pl
+++ b/scripts/dpkg-distaddfile.pl
@@ -14,25 +14,37 @@ require 'controllib.pl';
 require 'dpkg-gettext.pl';
 textdomain("dpkg-dev");
 
-sub usageversion {
-    printf STDERR _g(
-"Debian dpkg-distaddfile %s.  Copyright (C) 1996
-Ian Jackson.  This is free software; see the GNU General Public Licence
-version 2 or later for copying conditions.  There is NO warranty.
+sub version {
+    printf _g("Debian %s version %s.\n"), $progname, $version;
 
-Usage:
-  dpkg-distaddfile <filename> <section> <priority>
-Options:  -f<fileslistfile>      write files here instead of debian/files
-          -h                     print this message
-"), $version;
+    printf _g("
+Copyright (C) 1996 Ian Jackson.");
+
+    printf _g("
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO warranty.
+");
+}
+
+sub usage {
+    printf _g(
+"Usage: %s [<option>...] <filename> <section> <priority>
+
+Options:
+  -f<fileslistfile>        write files here instead of debian/files.
+  -h, --help               show this help message.
+      --version            show the version.
+"), $progname;
 }
 
 while (@ARGV && $ARGV[0] =~ m/^-/) {
     $_=shift(@ARGV);
     if (m/^-f/) {
         $fileslistfile= $';
-    } elsif (m/^-h$/) {
-        &usageversion; exit(0);
+    } elsif (m/^-(h|-help)$/) {
+        &usage; exit(0);
+    } elsif (m/^--version$/) {
+        &version; exit(0);
     } elsif (m/^--$/) {
         last;
     } else {
diff --git a/scripts/dpkg-divert.pl b/scripts/dpkg-divert.pl
index 428ff4185..b0f6ff239 100755
--- a/scripts/dpkg-divert.pl
+++ b/scripts/dpkg-divert.pl
@@ -3,6 +3,7 @@
 $version= '1.0.11'; # This line modified by Makefile
 $admindir= "/var/lib/dpkg"; # This line modified by Makefile
 $dpkglibdir= "../utils"; # This line modified by Makefile
+($0) = $0 =~ m:.*/(.+):;
 
 push (@INC, $dpkglibdir);
 require 'dpkg-gettext.pl';
@@ -11,43 +12,45 @@ textdomain("dpkg");
 $enoent=`$dpkglibdir/enoent` || die sprintf(_g("Cannot get ENOENT value from %s: %s"), "$dpkglibdir/enoent", $!);
 sub ENOENT { $enoent; }
 
-sub showversion {
-    printf(_g("Debian dpkg-divert %s")."\n", $version) || &quit(sprintf(_g("failed to write version: %s"), $!));
-}
+sub version {
+    printf _g("Debian %s version %s.\n"), $0, $version;
 
-sub usage {
-    &showversion;
-    print STDERR _g(<<EOF)
+    printf _g("
 Copyright (C) 1995 Ian Jackson.
-Copyright (C) 2000,2001 Wichert Akkerman.
+Copyright (C) 2000,2001 Wichert Akkerman.");
 
-This is free software; see the GNU General Public Licence version 2 or later
-for copying conditions. There is NO warranty.
+    printf _g("
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO warranty.
+");
+}
 
-Usage:
+sub usage {
+    printf(_g(
+"Usage: %s [<option> ...] <command>
 
- dpkg-divert [options] [--add] <file>               - add a diversion
- dpkg-divert [options] --remove <file>              - remove the diversion
- dpkg-divert [options] --list [<glob-pattern>]      - show file diversions
- dpkg-divert [options] --truename <file>            - return the diverted file
+Commands:
+  [--add] <file>           add a diversion.
+  --remove <file>          remove the diversion.
+  --list [<glob-pattern>]  show file diversions.
+  --truename <file>        return the diverted file.
 
-Options: 
-    --package <package>        name of the package whose copy of <file>
-                               will not be diverted.
-    --local                    all packages' versions are diverted.
-    --divert <divert-to>       the name used by other packages' versions.
-    --rename                   actually move the file aside (or back).
-    --quiet                    quiet operation, minimal output
-    --test                     don't do anything, just demonstrate
-    --help                     print this help screen and exit
-    --version                  output version and exit
-    --admindir <directory>     set the directory with the diversions file
+Options:
+  --package <package>      name of the package whose copy of <file> will not
+                             be diverted.
+  --local                  all packages' versions are diverted.
+  --divert <divert-to>     the name used by other packages' versions.
+  --rename                 actually move the file aside (or back).
+  --admindir <directory>   set the directory with the diversions file.
+  --test                   don't do anything, just demonstrate.
+  --quiet                  quiet operation, minimal output.
+  --help                   show this help message.
+  --version                show the version.
 
 When adding, default is --local and --divert <original>.distrib.
 When removing, --package or --local and --divert must match if specified.
 Package preinst/postrm scripts should always specify --package and --divert.
-EOF
-        || &quit(sprintf(_g("failed to write usage: %s"), $!));
+"), $0);
 }
 
 $testmode= 0;
@@ -69,7 +72,7 @@ while (@ARGV) {
     } elsif (m/^--help$/) {
         &usage; exit(0);
     } elsif (m/^--version$/) {
-        &showversion; exit(0);
+        &version; exit(0);
     } elsif (m/^--test$/) {
         $testmode= 1;
     } elsif (m/^--rename$/) {
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 3ea887eba..1c554e7e0 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -31,38 +31,47 @@ require 'controllib.pl';
 require 'dpkg-gettext.pl';
 textdomain("dpkg-dev");
 
-sub usageversion {
-    printf STDERR _g(
-"Debian dpkg-genchanges %s. 
+sub version {
+    printf _g("Debian %s version %s.\n"), $progname, $version;
+
+    printf _g("
 Copyright (C) 1996 Ian Jackson.
-Copyright (C) 2000,2001 Wichert Akkerman.
-This is free software; see the GNU General Public Licence version 2 or later
-for copying conditions.  There is NO warranty.
-
-Usage: dpkg-genchanges [options ...]
-
-Options:  -b                     binary-only build - no source files
-          -B                     arch-specific - no source or arch-indep files
-          -S                     source-only upload
-          -c<controlfile>        get control info from this file
-          -l<changelogfile>      get per-version info from this file
-          -f<fileslistfile>      get .deb files list from this file
-          -v<sinceversion>       include all changes later than version
-          -C<changesdescription> use change description from this file
-          -m<maintainer>         override control's maintainer value
-          -e<maintainer>         override changelog's maintainer value
-          -u<uploadfilesdir>     directory with files (default is \`..')
-          -si (default)          src includes orig for debian-revision 0 or 1
-          -sa                    source includes orig src
-          -sd                    source is diff and .dsc only
-          -q                     quiet - no informational messages on stderr
-          -F<changelogformat>    force change log format
-          -V<name>=<value>       set a substitution variable
-          -T<varlistfile>        read variables here, not debian/substvars
-          -D<field>=<value>      override or add a field and value
-          -U<field>              remove a field
-          -h                     print this message
-"), $version;
+Copyright (C) 2000,2001 Wichert Akkerman.");
+
+    printf _g("
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO warranty.
+");
+}
+
+sub usage {
+    printf _g(
+"Usage: %s [<option> ...]
+
+Options:
+  -b                       binary-only build - no source files.
+  -B                       arch-specific - no source or arch-indep files.
+  -S                       source-only upload.
+  -c<controlfile>          get control info from this file.
+  -l<changelogfile>        get per-version info from this file.
+  -f<fileslistfile>        get .deb files list from this file.
+  -v<sinceversion>         include all changes later than version.
+  -C<changesdescription>   use change description from this file.
+  -m<maintainer>           override control's maintainer value.
+  -e<maintainer>           override changelog's maintainer value.
+  -u<uploadfilesdir>       directory with files (default is \`..').
+  -si (default)            src includes orig for debian-revision 0 or 1.
+  -sa                      source includes orig src.
+  -sd                      source is diff and .dsc only.
+  -q                       quiet - no informational messages on stderr.
+  -F<changelogformat>      force change log format.
+  -V<name>=<value>         set a substitution variable.
+  -T<varlistfile>          read variables here, not debian/substvars.
+  -D<field>=<value>        override or add a field and value.
+  -U<field>                remove a field.
+  -h, --help               show this help message.
+      --version            show the version.
+"), $progname;
 }
 
 $i=100;grep($fieldimps{$_}=$i--,
@@ -113,8 +122,10 @@ while (@ARGV) {
         $remove{$1}= 1;
     } elsif (m/^-V(\w[-:0-9A-Za-z]*)[=:]/) {
         $substvar{$1}= $';
-    } elsif (m/^-h$/) {
-        &usageversion; exit(0);
+    } elsif (m/^-(h|-help)$/) {
+        &usage; exit(0);
+    } elsif (m/^--version$/) {
+        &version; exit(0);
     } else {
         &usageerr(sprintf(_g("unknown option \`%s'"), $_));
     }
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 72563f5fa..7d90e43bd 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -18,32 +18,41 @@ require 'controllib.pl';
 require 'dpkg-gettext.pl';
 textdomain("dpkg-dev");
 
-sub usageversion {
-    printf STDERR _g(
-"Debian dpkg-gencontrol %s. 
-Copyright 1996 Ian Jackson.
-Copyright 2000,2002 Wichert Akkerman.
-This is free software; see the GNU General Public Licence version 2 or later
-for copying conditions.  There is NO warranty.
+sub version {
+    printf _g("Debian %s version %s.\n"), $progname, $version;
 
-Usage: dpkg-gencontrol [options ...]
+    printf _g("
+Copyright (C) 1996 Ian Jackson.
+Copyright (C) 2000,2002 Wichert Akkerman.");
 
-Options:  -p<package>            print control file for package
-          -c<controlfile>        get control info from this file
-          -l<changelogfile>      get per-version info from this file
-          -F<changelogformat>    force change log format
-          -v<forceversion>       set version of binary package
-          -f<fileslistfile>      write files here instead of debian/files
-          -P<packagebuilddir>    temporary build dir instead of debian/tmp
-          -n<filename>           assume the package filename will be <filename>
-          -O                     write to stdout, not .../DEBIAN/control
-          -is, -ip, -isp, -ips   deprecated, ignored for compatibility
-          -D<field>=<value>      override or add a field and value
-          -U<field>              remove a field
-          -V<name>=<value>       set a substitution variable
-          -T<varlistfile>        read variables here, not debian/substvars
-          -h                     print this message
-"), $version;
+    printf _g("
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO warranty.
+");
+}
+
+sub usage {
+    printf _g(
+"Usage: %s [<option> ...]
+
+Options:
+  -p<package>              print control file for package.
+  -c<controlfile>          get control info from this file.
+  -l<changelogfile>        get per-version info from this file.
+  -F<changelogformat>      force change log format.
+  -v<forceversion>         set version of binary package.
+  -f<fileslistfile>        write files here instead of debian/files.
+  -P<packagebuilddir>      temporary build dir instead of debian/tmp.
+  -n<filename>             assume the package filename will be <filename>.
+  -O                       write to stdout, not .../DEBIAN/control.
+  -is, -ip, -isp, -ips     deprecated, ignored for compatibility.
+  -D<field>=<value>        override or add a field and value.
+  -U<field>                remove a field.
+  -V<name>=<value>         set a substitution variable.
+  -T<varlistfile>          read variables here, not debian/substvars.
+  -h, --help               show this help message.
+      --version            show the version.
+"), $progname;
 }
 
 $i=100;grep($fieldimps{$_}=$i--,
@@ -85,8 +94,10 @@ while (@ARGV) {
         $varlistfile= $';
     } elsif (m/^-n/) {
         $forcefilename= $';
-    } elsif (m/^-h$/) {
-        &usageversion; exit(0);
+    } elsif (m/^-(h|-help)$/) {
+        &usage; exit(0);
+    } elsif (m/^--version$/) {
+        &version; exit(0);
     } else {
         &usageerr(sprintf(_g("unknown option \`%s'"), $_));
     }
diff --git a/scripts/dpkg-name.sh b/scripts/dpkg-name.sh
index d4f02fc1e..e762417db 100755
--- a/scripts/dpkg-name.sh
+++ b/scripts/dpkg-name.sh
@@ -31,16 +31,21 @@ show_version () {
 }
 
 usage () {
-	echo "Usage: ${prog} file[s]
-  ${purpose}
-  file.deb changes to <package>_<version>_<architecture>.deb 
-  according to the ``underscores convention''.
-  -a|--no-architecture  No architecture part in filename
-  -o|--overwrite        Overwrite if file exists
-  -k|--symlink          Don't create a new file, but a symlink
-  -s|--subdir [dir]     Move file into subdir (Use with care)
-  -c|--create-dir       Create target dir if not there (Use with care)
-  -h|--help|-v|--version|-l|--license  Show help/version/license"
+	echo "Usage: ${prog} <file>...
+
+${purpose}
+file.deb changes to <package>_<version>_<architecture>.deb
+according to the ``underscores convention''.
+
+Options:
+  -a, --no-architecture    no architecture part in filename.
+  -o, --overwrite          overwrite if file exists.
+  -k, --symlink            don't create a new file, but a symlink.
+  -s, --subdir [dir]       move file into subdir (Use with care).
+  -c, --create-dir         create target dir if not there (Use with care).
+  -h, --help               show this help message.
+  -v, --version            show the version.
+  -l, --license            show license."
 }
 
 fileexists () {
diff --git a/scripts/dpkg-parsechangelog.pl b/scripts/dpkg-parsechangelog.pl
index d272e0c00..af3f4c8ba 100755
--- a/scripts/dpkg-parsechangelog.pl
+++ b/scripts/dpkg-parsechangelog.pl
@@ -17,21 +17,31 @@ require 'controllib.pl';
 require 'dpkg-gettext.pl';
 textdomain("dpkg-dev");
 
-sub usageversion {
-    printf STDERR _g(
-"Debian dpkg-parsechangelog %s.
+sub version {
+    printf _g("Debian %s version %s.\n"), $progname, $version;
+
+    printf _g("
 Copyright (C) 1996 Ian Jackson.
-Copyright (C) 2001 Wichert Akkerman
-This is free software; see the GNU General Public Licence
-version 2 or later for copying conditions.  There is NO warranty.
-
-Usage: dpkg-parsechangelog [<option> ...]
-Options:  -l<changelogfile>      get per-version info from this file
-          -v<sinceversion>       include all changes later than version
-          -F<changelogformat>    force change log format
-          -L<libdir>             look for change log parsers in <libdir>
-          -h                     print this message
-"), $version;
+Copyright (C) 2001 Wichert Akkerman");
+
+    printf _g("
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO warranty.
+");
+}
+
+sub usage {
+    printf _g(
+"Usage: %s [<option> ...]
+
+Options:
+  -l<changelogfile>        get per-version info from this file.
+  -v<sinceversion>         include all changes later than version.
+  -F<changelogformat>      force change log format.
+  -L<libdir>               look for change log parsers in <libdir>.
+  -h, --help               show this help message.
+      --version            show the version.
+"), $progname;
 }
 
 @ap=();
@@ -44,7 +54,8 @@ while (@ARGV) {
     push(@ap,$_);
     m/^--$/ && last;
     m/^-v/ && next;
-    if (m/^-h$/) { &usageversion; exit(0); }
+    if (m/^-(h|-help)$/) { &usage; exit(0); }
+    if (m/^--version$/) { &version; exit(0); }
     &usageerr("unknown option \`$_'");
 }
 
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index 2218c63e5..f459a8b6c 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -9,6 +9,8 @@ use IO::File;
 my $version= '1.2.6'; # This line modified by Makefile
 my $dpkglibdir= "."; # This line modified by Makefile
 
+($0) = $0 =~ m:.*/(.+):;
+
 push(@INC,$dpkglibdir);
 require 'dpkg-gettext.pl';
 textdomain("dpkg-dev");
@@ -50,26 +52,34 @@ my %field_case;
 
 use Getopt::Long qw(:config bundling);
 
-my %options = (help            => 0,
+my %options = (help            => sub { &usage; exit 0; },
+	       version         => \&version,
 	       udeb            => 0,
 	       arch            => undef,
 	       multiversion    => 0,
 	      );
 
-my $result = GetOptions(\%options,'help|h|?','udeb|u!','arch|a=s','multiversion|m!');
+my $result = GetOptions(\%options,'help|h|?','version','udeb|u!','arch|a=s','multiversion|m!');
+
+sub version {
+    printf _g("Debian %s version %s.\n"), $0, $version;
+    exit;
+}
 
-my $usage = _g(
-"dpkg-scanpackages [-u] [-a<arch>] [-m] binarypath overridefile [pathprefix] > Packages
+sub usage {
+    printf _g(
+"Usage: %s [<option> ...] <binarypath> <overridefile> [<pathprefix>] > Packages
 
- Options:
- --udeb, -u scan for udebs
- --arch, -a architecture to scan for
- --multiversion, -m allow multiple versions of a single package
- --help, -h show this help
+Options:
+  -u, --udeb               scan for udebs.
+  -a, --arch <arch>        architecture to scan for.
+  -m, --multiversion       allow multiple versions of a single package.
+  -h, --help               show this help message.
+      --version            show the version.
+"), $0;
+}
 
-");
-print( STDERR $usage ) and exit 1 if not $result or (@ARGV < 2);
-print($usage) and exit if $options{help};
+&usage and exit 1 if not $result and (@ARGV < 2);
 
 my $udeb = $options{udeb};
 my $arch = $options{arch};
diff --git a/scripts/dpkg-scansources.pl b/scripts/dpkg-scansources.pl
index f2761ca6c..d7deb9036 100755
--- a/scripts/dpkg-scansources.pl
+++ b/scripts/dpkg-scansources.pl
@@ -36,7 +36,7 @@ use Getopt::Long ();
 
 my $Exit = 0;
 (my $Me = $0) =~ s-.*/--;
-my $Version = q$Revision: 1.6.2.1 $ =~ /(\d\S+)/ ? $1 : '?';
+my $version= '1.6.2.1'; # This line modified by Makefile
 
 # %Override is a hash of lists.  The subs following describe what's in
 # the lists.
@@ -63,27 +63,12 @@ my $Src_override = undef;
 
 my @Option_spec = (
     'debug!'		=> \$Debug,
-    'help!'		=> sub { usage() },
+    'help!'		=> \&usage,
     'no-sort|n'		=> \$No_sort,
     'source-override|s=s' => \$Src_override,
-    'version'		=> sub { print "$Me version $Version\n"; exit },
+    'version'		=> \&version,
 );
 
-my $Usage = sprintf(_g(<<EOF), $Me, $Me);
-usage: %s [switch]... binary-dir [override-file [path-prefix]] > Sources
-
-switches:
-        --debug		turn debugging on
-        --help		show this and then die
-    -n, --no-sort	don\'t sort by package before outputting
-    -s, --source-override file
-			use file for additional source overrides, default
-			is regular override file with .src appended
-        --version	show the version and exit
-
-See the man page or \`perldoc %s\' for the full documentation.
-EOF
-
 sub debug {
     print @_, "\n" if $Debug;
 }
@@ -107,9 +92,28 @@ sub xwarn_noerror {
     warn xwarndie_mess @_;
 }
 
+sub version {
+    printf _g("Debian %s version %s.\n"), $Me, $version;
+    exit;
+}
+
 sub usage {
-    xwarn @_ if @_;
-    die $Usage;
+    printf _g(
+"Usage: %s [<option> ...] <binarypath> [<overridefile> [<pathprefix>]] > Sources
+
+Options:
+  -n, --no-sort            don't sort by package before outputting.
+  -s, --source-override <file>
+                           use file for additional source overrides, default
+                           is regular override file with .src appended.
+      --debug              turn debugging on.
+      --help               show this help message.
+      --version            show the version.
+
+See the man page for the full documentation.
+"), $Me;
+
+    exit;
 }
 
 # Getopt::Long has some really awful defaults.  This function loads it
@@ -500,7 +504,7 @@ sub main {
     my (@out);
 
     init;
-    @ARGV >= 1 && @ARGV <= 3 or usage _g("1 to 3 args expected")."\n";
+    @ARGV >= 1 && @ARGV <= 3 or xwarn _g("1 to 3 args expected\n") and usage;
 
     push @ARGV, undef		if @ARGV < 2;
     push @ARGV, ''		if @ARGV < 3;
diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index 8bd9321d6..3126b8196 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -32,29 +32,41 @@ textdomain("dpkg-dev");
 #use strict;
 #use warnings;
 
-sub usageversion {
-    printf STDERR _g(
-"Debian dpkg-shlibdeps %s.
+sub version {
+    printf _g("Debian %s version %s.\n"), $progname, $version;
+
+    printf _g("
 Copyright (C) 1996 Ian Jackson.
 Copyright (C) 2000 Wichert Akkerman.
-Copyright (C) 2006 Frank Lichtenheld.
+Copyright (C) 2006 Frank Lichtenheld.");
+
+    printf _g("
 This is free software; see the GNU General Public Licence version 2 or
-later for copying conditions.  There is NO warranty.
-
-Usage:
-  dpkg-shlibdeps [<option> ...] <executable>|-e<executable> [<option>] ...
-Positional arguments/options (order is significant):
-       <executable>           } include dependencies for <executable>
-       -e<executable>         }  (use -e if <executable> starts with \`-')
-       -d<dependencyfield>    next executable(s) set shlibs:<dependencyfield>
-Overall options (have global effect no matter where placed):
-       -p<varnameprefix>      set <varnameprefix>:* instead of shlibs:*.
-       -O                     print variable settings to stdout
-       -L<localshlibsfile>    shlibs override file, not debian/shlibs.local
-       -T<varlistfile>        update variables here, not debian/substvars
-       -t<type>               set package type (default is deb)
-Dependency fields recognised are %s
-"), $version, join("/",@depfields);
+later for copying conditions. There is NO warranty.
+");
+}
+
+sub usage {
+    printf _g(
+"Usage: %s [<option> ...] <executable>|-e<executable> [<option> ...]
+
+Positional options (order is significant):
+  <executable>             include dependencies for <executable>,
+  -e<executable>           (use -e if <executable> starts with \`-')
+  -d<dependencyfield>      next executable(s) set shlibs:<dependencyfield>.
+
+Options:
+  -p<varnameprefix>        set <varnameprefix>:* instead of shlibs:*.
+  -O                       print variable settings to stdout.
+  -L<localshlibsfile>      shlibs override file, not debian/shlibs.local.
+  -T<varlistfile>          update variables here, not debian/substvars.
+  -t<type>                 set package type (default is deb).
+  -h, --help               show this help message.
+      --version            show the version.
+
+Dependency fields recognised are:
+  %s
+"), $progname, join("/",@depfields);
 }
 
 my ($stdout, @exec, @execfield);
@@ -67,8 +79,10 @@ foreach (@ARGV) {
 	$shlibslocal= $POSTMATCH;
     } elsif (m/^-O$/) {
 	$stdout= 1;
-    } elsif (m/^-h$/) {
-	usageversion; exit(0);
+    } elsif (m/^-(h|-help)$/) {
+	usage; exit(0);
+    } elsif (m/^--version$/) {
+	version; exit(0);
     } elsif (m/^-d/) {
 	$dependencyfield= capit($POSTMATCH);
 	defined($depstrength{$dependencyfield}) ||
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index e33782a8e..e8d438145 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -57,41 +57,60 @@ $SIG{'INT'} = \&exit_handler;
 $SIG{'HUP'} = \&exit_handler;
 $SIG{'QUIT'} = \&exit_handler;
 
-sub usageversion {
-    printf STDERR _g(
-"Debian dpkg-source %s.  Copyright (C) 1996
-Ian Jackson and Klee Dienes.  This is free software; see the GNU
-General Public Licence version 2 or later for copying conditions.
-There is NO warranty.
-
-Usage:  dpkg-source -x <filename>.dsc [<output-directory>]
-        dpkg-source -b <directory> [<orig-directory>|<orig-targz>|\'\']
-Build options:   -c<controlfile>     get control info from this file
-                 -l<changelogfile>   get per-version info from this file
-                 -F<changelogformat> force change log format
-                 -V<name>=<value>    set a substitution variable
-                 -T<varlistfile>     read variables here, not debian/substvars
-                 -D<field>=<value>   override or add a .dsc field and value
-                 -U<field>           remove a field
-                 -W                  Turn certain errors into warnings. 
-                 -E                  When -W is enabled, -E disables it.
-                 -q                  quiet operation, do not print warnings.
-                 -sa                 auto select orig source (-sA is default)
-                 -i[<regexp>]        filter out files to ignore diffs of.
-                                     Defaults to: '%s'
-                 -I<filename>        filter out files when building tarballs.
-                 -sk                 use packed orig source (unpack & keep)
-                 -sp                 use packed orig source (unpack & remove)
-                 -su                 use unpacked orig source (pack & keep)
-                 -sr                 use unpacked orig source (pack & remove)
-                 -ss                 trust packed & unpacked orig src are same
-                 -sn                 there is no diff, do main tarfile only
-                 -sA,-sK,-sP,-sU,-sR like -sa,-sp,-sk,-su,-sr but may overwrite
-Extract options: -sp (default)       leave orig source packed in current dir
-                 -sn                 do not copy original source to current dir
-                 -su                 unpack original source tree too
-General options: -h                  print this message
-"), $version, $diff_ignore_default_regexp;
+sub version {
+    printf _g("Debian %s version %s.\n"), $progname, $version;
+
+    printf _g("
+Copyright (C) 1996 Ian Jackson and Klee Dienes.");
+
+    printf _g("
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO warranty.
+");
+}
+
+sub usage {
+    printf _g(
+"Usage: %s [<option> ...] <command>
+
+Commands:
+  -x <filename>.dsc [<output-dir>]
+                           extract source package.
+  -b <dir> [<orig-dir>|<orig-targz>|\'\']
+                           build source package.
+
+Build options:
+  -c<controlfile>          get control info from this file.
+  -l<changelogfile>        get per-version info from this file.
+  -F<changelogformat>      force change log format.
+  -V<name>=<value>         set a substitution variable.
+  -T<varlistfile>          read variables here, not debian/substvars.
+  -D<field>=<value>        override or add a .dsc field and value.
+  -U<field>                remove a field.
+  -W                       turn certain errors into warnings.
+  -E                       when -W is enabled, -E disables it.
+  -q                       quiet operation, do not print warnings.
+  -i[<regexp>]             filter out files to ignore diffs of
+                             (defaults to: '%s').
+  -I<filename>             filter out files when building tarballs.
+  -sa                      auto select orig source (-sA is default).
+  -sk                      use packed orig source (unpack & keep).
+  -sp                      use packed orig source (unpack & remove).
+  -su                      use unpacked orig source (pack & keep).
+  -sr                      use unpacked orig source (pack & remove).
+  -ss                      trust packed & unpacked orig src are same.
+  -sn                      there is no diff, do main tarfile only.
+  -sA,-sK,-sP,-sU,-sR      like -sa,-sk,-sp,-su,-sr but may overwrite.
+
+Extract options:
+  -sp (default)            leave orig source packed in current dir.
+  -sn                      do not copy original source to current dir.
+  -su                      unpack original source tree too.
+
+General options:
+  -h, --help               show this help message.
+      --version            show the version.
+"), $progname, $diff_ignore_default_regexp;
 }
 
 sub handleformat {
@@ -135,8 +154,10 @@ while (@ARGV && $ARGV[0] =~ m/^-/) {
         $substvar{$1}= "$'";
     } elsif (m/^-T/) {
         $varlistfile= "$'";
-    } elsif (m/^-h$/) {
-        &usageversion; exit(0);
+    } elsif (m/^-(h|-help)$/) {
+        &usage; exit(0);
+    } elsif (m/^--version$/) {
+        &version; exit(0);
     } elsif (m/^-W$/) {
         $warnable_error= 1;
     } elsif (m/^-E$/) {
diff --git a/scripts/dpkg-statoverride.pl b/scripts/dpkg-statoverride.pl
index b7b2618a2..86ed9e343 100755
--- a/scripts/dpkg-statoverride.pl
+++ b/scripts/dpkg-statoverride.pl
@@ -6,6 +6,8 @@ use POSIX qw(:errno_h :signal_h);
 $admindir= "/var/lib/dpkg"; # This line modified by Makefile
 $version= '1.3.0'; # This line modified by Makefile
 
+($0) = $0 =~ m:.*/(.+):;
+
 my $dpkglibdir= "."; # This line modified by Makefile
 push (@INC, $dpkglibdir);
 require 'dpkg-gettext.pl';
@@ -16,27 +18,36 @@ $doforce= 0;
 $doupdate= 0;
 $mode= "";
 
-sub UsageVersion {
-	printf(STDERR _g(<<EOF), $version) || &quit(sprintf(_g("failed to write usage: %s"), $!));
-Debian dpkg-statoverride %s.
-Copyright (C) 2000 Wichert Akkerman.
+sub version {
+	printf _g("Debian %s version %s.\n"), $0, $version;
+
+	printf _g("
+Copyright (C) 2000 Wichert Akkerman.");
 
-This is free software; see the GNU General Public Licence version 2 or later
-for copying conditions.  There is NO warranty.
+	printf _g("
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO warranty.
+");
+}
 
-Usage:
+sub usage {
+	printf _g(
+"Usage: %s [<option> ...] <command>
 
-  dpkg-statoverride [options] --add <owner> <group> <mode> <file>
-  dpkg-statoverride [options] --remove <file>
-  dpkg-statoverride [options] --list [<glob-pattern>]
+Commands:
+  --add <owner> <group> <mode> <file>
+                           add a new entry into the database.
+  --remove <file>          remove file from the database.
+  --list [<glob-pattern>]  list current overrides in the database.
 
 Options:
-  --update                 immediately update file permissions
-  --force                  force an action even if a sanity check fails
-  --quiet                  quiet operation, minimal output
-  --help                   print this help screen and exit
-  --admindir <directory>   set the directory with the statoverride file
-EOF
+  --admindir <directory>   set the directory with the statoverride file.
+  --update                 immediately update file permissions.
+  --force                  force an action even if a sanity check fails.
+  --quiet                  quiet operation, minimal output.
+  --help                   show this help message.
+  --version                show the version.
+"), $0;
 }
 
 sub CheckModeConflict {
@@ -50,7 +61,9 @@ while (@ARGV) {
 	if (!m/^-/) {
 		unshift(@ARGV,$_); last;
 	} elsif (m/^--help$/) {
-		&UsageVersion; exit(0);
+		&usage; exit(0);
+	} elsif (m/^--version$/) {
+		&version; exit(0);
 	} elsif (m/^--update$/) {
 		$doupdate=1;
 	} elsif (m/^--quiet$/) {
diff --git a/scripts/install-info.pl b/scripts/install-info.pl
index dae59997e..a99512e65 100755
--- a/scripts/install-info.pl
+++ b/scripts/install-info.pl
@@ -8,30 +8,48 @@ push (@INC, $dpkglibdir);
 require 'dpkg-gettext.pl';
 textdomain("dpkg");
 
+($0) = $0 =~ m:.*/(.+):;
+
 # fixme: sort entries
 # fixme: send to FSF ?
 
 $version= '0.93.42.2'; # This line modified by Makefile
 sub version {
-        $file = $_[0];
-        printf $file _g(<<END), $version;
-Debian install-info %s.  Copyright (C) 1994,1995
-Ian Jackson.  This is free software; see the GNU General Public Licence
-version 2 or later for copying conditions.  There is NO warranty.
-END
+    printf _g("Debian %s version %s.\n"), $0, $version;
+
+    printf _g("
+Copyright (C) 1994,1995 Ian Jackson.");
+
+    printf _g("
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO warranty.
+");
 }
 
 sub usage {
     $file = $_[0];
-    print $file _g(<<END);
-usage: install-info [--version] [--help] [--debug] [--maxwidth=nnn]
-             [--section regexp title] [--infodir=xxx] [--align=nnn]
-             [--calign=nnn] [--quiet] [--menuentry=xxx] [--info-dir=xxx]
-             [--keep-old] [--description=xxx] [--test]
-             [--remove | --remove-exactly ] [--dir-file=xxx]
-             [--]
-             filename
-END
+    printf $file _g(
+"Usage: %s [<options> ...] [--] <filename>
+
+Options:
+  --section <regexp> <title>
+                           put the new entry in the <regex> matched section
+                           or create a new one with <title> if non-existent.
+  --menuentry=<text>       set the menu entry.
+  --description=<text>     set the description to be used in the menu entry.
+  --info-file=<path>       specify info file to install in the directory.
+  --dir-file=<path>        specify file name of info directory file.
+  --infodir=<directory>    same as '--dir-file=<directory>/dir'.
+  --info-dir=<directory>   likewise.
+  --keep-old               do not replace entries nor remove empty ones.
+  --remove                 remove the entry specified by <filename> basename.
+  --remove-exactly         remove the exact <filename> entry.
+  --test                   enables test mode (no actions taken).
+  --debug                  enables debug mode (show more information).
+  --quiet                  do not show output messages.
+  --help                   show this help message.
+  --version                show the version.
+"), $0;
 }
 
 $dirfile = '/usr/share/info/dir';
@@ -73,6 +91,8 @@ while ($ARGV[0] =~ m/^--/) {
         $remove_exactly=1;
     } elsif ($_ eq '--help') {
         &usage(STDOUT); exit 0;
+    } elsif ($_ eq '--version') {
+        &version; exit 0;
     } elsif ($_ eq '--debug') {
 	open(DEBUG,">&STDERR")
 	    || die sprintf(_g("Could not open stderr for output! %s"), $!)."\n";
@@ -102,7 +122,7 @@ while ($ARGV[0] =~ m/^--/) {
     }
 }
 
-if (!@ARGV) { &version(STDERR); print STDERR "\n"; &usage(STDERR); exit 1; }
+if (!@ARGV) { &usage(STDERR); exit 1; }
 
 if ( !$filename ) {
 	$filename= shift(@ARGV);
diff --git a/scripts/po/dpkg-dev.pot b/scripts/po/dpkg-dev.pot
index 577ac275e..a3c621de9 100644
--- a/scripts/po/dpkg-dev.pot
+++ b/scripts/po/dpkg-dev.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-12 19:24-0500\n"
+"POT-Creation-Date: 2006-05-23 06:44+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,14 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: scripts/822-date.pl:10
-msgid "usage: 822-date"
-msgstr ""
-
-#: scripts/822-date.pl:12
-msgid "Using this program is deprecated. Please use `date -R' instead."
-msgstr ""
-
 #: scripts/controllib.pl:64 scripts/controllib.pl:67
 #, perl-format
 msgid "unable to get login information for username \"%s\""
@@ -116,8 +108,8 @@ msgstr ""
 msgid "fork for parse changelog"
 msgstr ""
 
-#: scripts/controllib.pl:305 scripts/dpkg-genchanges.pl:225
-#: scripts/dpkg-gencontrol.pl:169 scripts/dpkg-source.pl:239
+#: scripts/controllib.pl:305 scripts/dpkg-genchanges.pl:236
+#: scripts/dpkg-gencontrol.pl:180 scripts/dpkg-source.pl:260
 msgid "parsed version of changelog"
 msgstr ""
 
@@ -238,1856 +230,1900 @@ msgstr ""
 msgid "%s: failure: %s failed with unknown exit code %d"
 msgstr ""
 
-#: scripts/dpkg-architecture.pl:36
+#: scripts/dpkg-architecture.pl:34 scripts/dpkg-distaddfile.pl:18
+#: scripts/dpkg-genchanges.pl:35 scripts/dpkg-gencontrol.pl:22
+#: scripts/dpkg-parsechangelog.pl:21 scripts/dpkg-scanpackages.pl:65
+#: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:36
+#: scripts/dpkg-source.pl:61 scripts/changelog/debian.pl:26
 #, perl-format
+msgid "Debian %s version %s.\n"
+msgstr ""
+
+#: scripts/dpkg-architecture.pl:36
 msgid ""
-"Debian %s %s.\n"
-"Copyright (C) 2004-2005 Scott James Remnant <scott@netsplit.com>,\n"
+"\n"
 "Copyright (C) 1999-2001 Marcus Brinkmann <brinkmd@debian.org>.\n"
-"This is free software; see the GNU General Public Licence\n"
-"version 2 or later for copying conditions.  There is NO warranty.\n"
+"Copyright (C) 2004-2005 Scott James Remnant <scott@netsplit.com>."
+msgstr ""
+
+#: scripts/dpkg-architecture.pl:40 scripts/dpkg-distaddfile.pl:23
+#: scripts/dpkg-genchanges.pl:41 scripts/dpkg-gencontrol.pl:28
+#: scripts/dpkg-parsechangelog.pl:27 scripts/dpkg-shlibdeps.pl:43
+#: scripts/dpkg-source.pl:66 scripts/changelog/debian.pl:30
+msgid ""
 "\n"
-"Usage:\n"
-"  %s [<option> ...] [<action>]\n"
-"Options:\n"
-"       -a<debian-arch>    set current Debian architecture\n"
-"       -t<gnu-system>     set current GNU system type\n"
-"       -L                 list valid architectures\n"
-"       -f                 force flag (override variables set in "
-"environment)\n"
-"Actions:\n"
-"       -l                 list variables (default)\n"
-"       -e<debian-arch>    compare with current Debian architecture\n"
-"       -i<arch-alias>     check if current Debian architecture is <arch-"
-"alias>\n"
-"       -q<variable>       prints only the value of <variable>.\n"
-"       -s                 print command to set environment variables\n"
-"       -u                 print command to unset environment variables\n"
-"       -c <command>       set environment and run the command in it.\n"
+"This is free software; see the GNU General Public Licence version 2 or\n"
+"later for copying conditions. There is NO warranty.\n"
 msgstr ""
 
-#: scripts/dpkg-architecture.pl:62
+#: scripts/dpkg-architecture.pl:48
+#, perl-format
+msgid ""
+"Usage: %s [<option> ...] [<action>]\n"
+"\n"
+"Options:\n"
+"  -a<debian-arch>    set current Debian architecture.\n"
+"  -t<gnu-system>     set current GNU system type.\n"
+"  -L                 list valid architectures.\n"
+"  -f                 force flag (override variables set in environment).\n"
+"\n"
+"Actions:\n"
+"  -l                 list variables (default).\n"
+"  -e<debian-arch>    compare with current Debian architecture.\n"
+"  -i<arch-alias>     check if current Debian architecture is <arch-alias>.\n"
+"  -q<variable>       prints only the value of <variable>.\n"
+"  -s                 print command to set environment variables.\n"
+"  -u                 print command to unset environment variables.\n"
+"  -c <command>       set environment and run the command in it.\n"
+"  --help             show this help message.\n"
+"  --version          show the version.\n"
+msgstr ""
+
+#: scripts/dpkg-architecture.pl:71
 msgid "unable to open cputable"
 msgstr ""
 
-#: scripts/dpkg-architecture.pl:75
+#: scripts/dpkg-architecture.pl:84
 msgid "unable to open ostable"
 msgstr ""
 
-#: scripts/dpkg-architecture.pl:157
+#: scripts/dpkg-architecture.pl:166
 msgid ""
 "Couldn't determine gcc system type, falling back to default (native "
 "compilation)"
 msgstr ""
 
-#: scripts/dpkg-architecture.pl:166
+#: scripts/dpkg-architecture.pl:175
 #, perl-format
 msgid ""
 "Unknown gcc system type %s, falling back to default (native compilation)"
 msgstr ""
 
-#: scripts/dpkg-architecture.pl:213 scripts/dpkg-genchanges.pl:119
-#: scripts/dpkg-gencontrol.pl:91 scripts/dpkg-shlibdeps.pl:81
+#: scripts/dpkg-architecture.pl:228 scripts/dpkg-genchanges.pl:130
+#: scripts/dpkg-gencontrol.pl:102 scripts/dpkg-shlibdeps.pl:95
 #, perl-format
 msgid "unknown option `%s'"
 msgstr ""
 
-#: scripts/dpkg-architecture.pl:219
+#: scripts/dpkg-architecture.pl:234
 #, perl-format
 msgid "unknown Debian architecture %s, you must specify GNU system type, too"
 msgstr ""
 
-#: scripts/dpkg-architecture.pl:224
+#: scripts/dpkg-architecture.pl:239
 #, perl-format
 msgid "unknown GNU system type %s, you must specify Debian architecture, too"
 msgstr ""
 
-#: scripts/dpkg-architecture.pl:229
+#: scripts/dpkg-architecture.pl:244
 #, perl-format
 msgid ""
 "Default GNU system type %s for Debian arch %s does not match specified GNU "
 "system type %s"
 msgstr ""
 
-#: scripts/dpkg-architecture.pl:237
+#: scripts/dpkg-architecture.pl:252
 #, perl-format
 msgid "Specified GNU system type %s does not match gcc system type %s."
 msgstr ""
 
-#: scripts/dpkg-architecture.pl:301
+#: scripts/dpkg-architecture.pl:316
 #, perl-format
 msgid "%s is not a supported variable name"
 msgstr ""
 
 #: scripts/dpkg-checkbuilddeps.pl:17
+#, perl-format
 msgid ""
-"Usage: dpkg-checkbuilddeps [-B] [control-file]\n"
-"\t-B\t\tbinary-only, ignore -Indep\n"
-"\tcontrol-file\tcontrol file to process [Default: debian/control]\n"
+"Usage: %s [<option> ...] [<control-file>]\n"
+"\n"
+"Options:\n"
+"  control-file   control file to process (default: debian/control).\n"
+"  -B             binary-only, ignore -Indep.\n"
+"  -h             show this help message.\n"
 msgstr ""
 
-#: scripts/dpkg-checkbuilddeps.pl:68
+#: scripts/dpkg-checkbuilddeps.pl:69
 #, perl-format
 msgid "%s: Unmet build dependencies: "
 msgstr ""
 
-#: scripts/dpkg-checkbuilddeps.pl:72
+#: scripts/dpkg-checkbuilddeps.pl:73
 #, perl-format
 msgid "%s: Build conflicts: "
 msgstr ""
 
-#: scripts/dpkg-checkbuilddeps.pl:145 scripts/dpkg-gencontrol.pl:190
-#: scripts/dpkg-source.pl:186
+#: scripts/dpkg-checkbuilddeps.pl:146 scripts/dpkg-gencontrol.pl:201
+#: scripts/dpkg-source.pl:207
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:19
+#: scripts/dpkg-distaddfile.pl:20 scripts/changelog/debian.pl:28
+msgid ""
+"\n"
+"Copyright (C) 1996 Ian Jackson."
+msgstr ""
+
+#: scripts/dpkg-distaddfile.pl:31
 #, perl-format
 msgid ""
-"Debian dpkg-distaddfile %s.  Copyright (C) 1996\n"
-"Ian Jackson.  This is free software; see the GNU General Public Licence\n"
-"version 2 or later for copying conditions.  There is NO warranty.\n"
+"Usage: %s [<option>...] <filename> <section> <priority>\n"
 "\n"
-"Usage:\n"
-"  dpkg-distaddfile <filename> <section> <priority>\n"
-"Options:  -f<fileslistfile>      write files here instead of debian/files\n"
-"          -h                     print this message\n"
+"Options:\n"
+"  -f<fileslistfile>        write files here instead of debian/files.\n"
+"  -h, --help               show this help message.\n"
+"      --version            show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:39 scripts/dpkg-source.pl:149
+#: scripts/dpkg-distaddfile.pl:51 scripts/dpkg-source.pl:170
 #, perl-format
 msgid "unknown option %s"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:43
+#: scripts/dpkg-distaddfile.pl:55
 msgid "need exactly a filename, section and priority"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:47
+#: scripts/dpkg-distaddfile.pl:59
 msgid "filename, section and priority may contain no whitespace"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:50 scripts/dpkg-gencontrol.pl:246
+#: scripts/dpkg-distaddfile.pl:62 scripts/dpkg-gencontrol.pl:257
 msgid "open new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:52 scripts/dpkg-gencontrol.pl:249
+#: scripts/dpkg-distaddfile.pl:64 scripts/dpkg-gencontrol.pl:260
 msgid "chown new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:57 scripts/dpkg-gencontrol.pl:258
+#: scripts/dpkg-distaddfile.pl:69 scripts/dpkg-gencontrol.pl:269
 msgid "copy old entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:60 scripts/dpkg-gencontrol.pl:262
+#: scripts/dpkg-distaddfile.pl:72 scripts/dpkg-gencontrol.pl:273
 msgid "read old files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:63 scripts/dpkg-gencontrol.pl:270
+#: scripts/dpkg-distaddfile.pl:75 scripts/dpkg-gencontrol.pl:281
 msgid "write new entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:64 scripts/dpkg-gencontrol.pl:271
+#: scripts/dpkg-distaddfile.pl:76 scripts/dpkg-gencontrol.pl:282
 msgid "close new files list file"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:36
-#, perl-format
+#: scripts/dpkg-genchanges.pl:37
 msgid ""
-"Debian dpkg-genchanges %s. \n"
-"Copyright (C) 1996 Ian Jackson.\n"
-"Copyright (C) 2000,2001 Wichert Akkerman.\n"
-"This is free software; see the GNU General Public Licence version 2 or "
-"later\n"
-"for copying conditions.  There is NO warranty.\n"
 "\n"
-"Usage: dpkg-genchanges [options ...]\n"
+"Copyright (C) 1996 Ian Jackson.\n"
+"Copyright (C) 2000,2001 Wichert Akkerman."
+msgstr ""
+
+#: scripts/dpkg-genchanges.pl:49
+#, perl-format
+msgid ""
+"Usage: %s [<option> ...]\n"
 "\n"
-"Options:  -b                     binary-only build - no source files\n"
-"          -B                     arch-specific - no source or arch-indep "
-"files\n"
-"          -S                     source-only upload\n"
-"          -c<controlfile>        get control info from this file\n"
-"          -l<changelogfile>      get per-version info from this file\n"
-"          -f<fileslistfile>      get .deb files list from this file\n"
-"          -v<sinceversion>       include all changes later than version\n"
-"          -C<changesdescription> use change description from this file\n"
-"          -m<maintainer>         override control's maintainer value\n"
-"          -e<maintainer>         override changelog's maintainer value\n"
-"          -u<uploadfilesdir>     directory with files (default is `..')\n"
-"          -si (default)          src includes orig for debian-revision 0 or "
-"1\n"
-"          -sa                    source includes orig src\n"
-"          -sd                    source is diff and .dsc only\n"
-"          -q                     quiet - no informational messages on "
-"stderr\n"
-"          -F<changelogformat>    force change log format\n"
-"          -V<name>=<value>       set a substitution variable\n"
-"          -T<varlistfile>        read variables here, not debian/substvars\n"
-"          -D<field>=<value>      override or add a field and value\n"
-"          -U<field>              remove a field\n"
-"          -h                     print this message\n"
-msgstr ""
-
-#: scripts/dpkg-genchanges.pl:76 scripts/dpkg-genchanges.pl:79
-#: scripts/dpkg-genchanges.pl:84
+"Options:\n"
+"  -b                       binary-only build - no source files.\n"
+"  -B                       arch-specific - no source or arch-indep files.\n"
+"  -S                       source-only upload.\n"
+"  -c<controlfile>          get control info from this file.\n"
+"  -l<changelogfile>        get per-version info from this file.\n"
+"  -f<fileslistfile>        get .deb files list from this file.\n"
+"  -v<sinceversion>         include all changes later than version.\n"
+"  -C<changesdescription>   use change description from this file.\n"
+"  -m<maintainer>           override control's maintainer value.\n"
+"  -e<maintainer>           override changelog's maintainer value.\n"
+"  -u<uploadfilesdir>       directory with files (default is `..').\n"
+"  -si (default)            src includes orig for debian-revision 0 or 1.\n"
+"  -sa                      source includes orig src.\n"
+"  -sd                      source is diff and .dsc only.\n"
+"  -q                       quiet - no informational messages on stderr.\n"
+"  -F<changelogformat>      force change log format.\n"
+"  -V<name>=<value>         set a substitution variable.\n"
+"  -T<varlistfile>          read variables here, not debian/substvars.\n"
+"  -D<field>=<value>        override or add a field and value.\n"
+"  -U<field>                remove a field.\n"
+"  -h, --help               show this help message.\n"
+"      --version            show the version.\n"
+msgstr ""
+
+#: scripts/dpkg-genchanges.pl:85 scripts/dpkg-genchanges.pl:88
+#: scripts/dpkg-genchanges.pl:93
 msgid "cannot combine -b or -B and -S"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:82
+#: scripts/dpkg-genchanges.pl:91
 #, perl-format
 msgid "%s: arch-specific upload - not including arch-independent packages"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:129
+#: scripts/dpkg-genchanges.pl:140
 msgid "cannot read files list file"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:133
+#: scripts/dpkg-genchanges.pl:144
 #, perl-format
 msgid "duplicate files list entry for package %s (line %d)"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:139 scripts/dpkg-genchanges.pl:151
+#: scripts/dpkg-genchanges.pl:150 scripts/dpkg-genchanges.pl:162
 #, perl-format
 msgid "duplicate files list entry for file %s (line %d)"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:156
+#: scripts/dpkg-genchanges.pl:167
 #, perl-format
 msgid "badly formed line in files list file, line %d"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:170 scripts/dpkg-gencontrol.pl:123
-#: scripts/dpkg-source.pl:191
+#: scripts/dpkg-genchanges.pl:181 scripts/dpkg-gencontrol.pl:134
+#: scripts/dpkg-source.pl:212
 msgid "general section of control info file"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:177
+#: scripts/dpkg-genchanges.pl:188
 #, perl-format
 msgid "package %s in control file but not in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:212 scripts/dpkg-gencontrol.pl:154
-#: scripts/dpkg-source.pl:226
+#: scripts/dpkg-genchanges.pl:223 scripts/dpkg-gencontrol.pl:165
+#: scripts/dpkg-source.pl:247
 msgid "package's section of control info file"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:229 scripts/dpkg-gencontrol.pl:173
-#: scripts/dpkg-source.pl:243
+#: scripts/dpkg-genchanges.pl:240 scripts/dpkg-gencontrol.pl:184
+#: scripts/dpkg-source.pl:264
 #, perl-format
 msgid "value from nowhere, with key >%s< and value >%s<"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:236
+#: scripts/dpkg-genchanges.pl:247
 msgid "read changesdescription"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:247
+#: scripts/dpkg-genchanges.pl:258
 #, perl-format
 msgid "package %s listed in files list but not in control info"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:253
+#: scripts/dpkg-genchanges.pl:264
 #, perl-format
 msgid "missing Section for binary package %s; using '-'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:254
+#: scripts/dpkg-genchanges.pl:265
 #, perl-format
 msgid "package %s has section %s in control file but %s in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:259
+#: scripts/dpkg-genchanges.pl:270
 #, perl-format
 msgid "package %s has priority %s in control file but %s in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:273
+#: scripts/dpkg-genchanges.pl:284
 msgid "missing Section for source files"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:275
+#: scripts/dpkg-genchanges.pl:286
 msgid "missing Priority for source files"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:279 scripts/dpkg-source.pl:588
-#: scripts/dpkg-source.pl:618
+#: scripts/dpkg-genchanges.pl:290 scripts/dpkg-source.pl:609
+#: scripts/dpkg-source.pl:639
 #, perl-format
 msgid "cannot open .dsc file %s: %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:287 scripts/dpkg-source.pl:655
+#: scripts/dpkg-genchanges.pl:298 scripts/dpkg-source.pl:676
 #, perl-format
 msgid "Files field contains bad line `%s'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:296
+#: scripts/dpkg-genchanges.pl:307
 msgid "not including original source code in upload"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:300
+#: scripts/dpkg-genchanges.pl:311
 msgid "Ignoring -sd option for native Debian package"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:302
+#: scripts/dpkg-genchanges.pl:313
 msgid "including full source code in upload"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:305
+#: scripts/dpkg-genchanges.pl:316
 msgid "binary-only upload - not including any source code"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:309
+#: scripts/dpkg-genchanges.pl:320
 msgid "write original source message"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:330
+#: scripts/dpkg-genchanges.pl:341
 #, perl-format
 msgid "cannot open upload file %s for reading"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:331
+#: scripts/dpkg-genchanges.pl:342
 #, perl-format
 msgid "cannot fstat upload file %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:332
+#: scripts/dpkg-genchanges.pl:343
 #, perl-format
 msgid "upload file %s is empty"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:333
+#: scripts/dpkg-genchanges.pl:344
 #, perl-format
 msgid "md5sum upload file %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:335
+#: scripts/dpkg-genchanges.pl:346
 #, perl-format
 msgid "md5sum upload file %s gave strange output `%s'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:338
+#: scripts/dpkg-genchanges.pl:349
 #, perl-format
 msgid "md5sum of source file %s (%s) is different from md5sum in %s (%s)"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:350 scripts/dpkg-source.pl:251
+#: scripts/dpkg-genchanges.pl:361 scripts/dpkg-source.pl:272
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:354 scripts/dpkg-gencontrol.pl:211
-#: scripts/dpkg-gencontrol.pl:214 scripts/dpkg-source.pl:254
+#: scripts/dpkg-genchanges.pl:365 scripts/dpkg-gencontrol.pl:222
+#: scripts/dpkg-gencontrol.pl:225 scripts/dpkg-source.pl:275
 #, perl-format
 msgid "missing information for output field %s"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:23
-#, perl-format
+#: scripts/dpkg-gencontrol.pl:24
 msgid ""
-"Debian dpkg-gencontrol %s. \n"
-"Copyright 1996 Ian Jackson.\n"
-"Copyright 2000,2002 Wichert Akkerman.\n"
-"This is free software; see the GNU General Public Licence version 2 or "
-"later\n"
-"for copying conditions.  There is NO warranty.\n"
 "\n"
-"Usage: dpkg-gencontrol [options ...]\n"
+"Copyright (C) 1996 Ian Jackson.\n"
+"Copyright (C) 2000,2002 Wichert Akkerman."
+msgstr ""
+
+#: scripts/dpkg-gencontrol.pl:36
+#, perl-format
+msgid ""
+"Usage: %s [<option> ...]\n"
 "\n"
-"Options:  -p<package>            print control file for package\n"
-"          -c<controlfile>        get control info from this file\n"
-"          -l<changelogfile>      get per-version info from this file\n"
-"          -F<changelogformat>    force change log format\n"
-"          -v<forceversion>       set version of binary package\n"
-"          -f<fileslistfile>      write files here instead of debian/files\n"
-"          -P<packagebuilddir>    temporary build dir instead of debian/tmp\n"
-"          -n<filename>           assume the package filename will be "
-"<filename>\n"
-"          -O                     write to stdout, not .../DEBIAN/control\n"
-"          -is, -ip, -isp, -ips   deprecated, ignored for compatibility\n"
-"          -D<field>=<value>      override or add a field and value\n"
-"          -U<field>              remove a field\n"
-"          -V<name>=<value>       set a substitution variable\n"
-"          -T<varlistfile>        read variables here, not debian/substvars\n"
-"          -h                     print this message\n"
-msgstr ""
-
-#: scripts/dpkg-gencontrol.pl:61
+"Options:\n"
+"  -p<package>              print control file for package.\n"
+"  -c<controlfile>          get control info from this file.\n"
+"  -l<changelogfile>        get per-version info from this file.\n"
+"  -F<changelogformat>      force change log format.\n"
+"  -v<forceversion>         set version of binary package.\n"
+"  -f<fileslistfile>        write files here instead of debian/files.\n"
+"  -P<packagebuilddir>      temporary build dir instead of debian/tmp.\n"
+"  -n<filename>             assume the package filename will be <filename>.\n"
+"  -O                       write to stdout, not .../DEBIAN/control.\n"
+"  -is, -ip, -isp, -ips     deprecated, ignored for compatibility.\n"
+"  -D<field>=<value>        override or add a field and value.\n"
+"  -U<field>                remove a field.\n"
+"  -V<name>=<value>         set a substitution variable.\n"
+"  -T<varlistfile>          read variables here, not debian/substvars.\n"
+"  -h, --help               show this help message.\n"
+"      --version            show the version.\n"
+msgstr ""
+
+#: scripts/dpkg-gencontrol.pl:70
 #, perl-format
 msgid "Illegal package name `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:101
+#: scripts/dpkg-gencontrol.pl:112
 #, perl-format
 msgid "package %s not in control info"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:106
+#: scripts/dpkg-gencontrol.pl:117
 #, perl-format
 msgid "must specify package since control info has many (%s)"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:140
+#: scripts/dpkg-gencontrol.pl:151
 #, perl-format
 msgid "`%s' is not a legal architecture string."
 msgid_plural "`%s' are not legal architecture strings."
 msgstr[0] ""
 msgstr[1] ""
 
-#: scripts/dpkg-gencontrol.pl:146
+#: scripts/dpkg-gencontrol.pl:157
 #, perl-format
 msgid "current build architecture %s does not appear in package's list (%s)"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:225
+#: scripts/dpkg-gencontrol.pl:236
 msgid "fork for du"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:227
+#: scripts/dpkg-gencontrol.pl:238
 #, perl-format
 msgid "chdir for du to `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:228
+#: scripts/dpkg-gencontrol.pl:239
 msgid "exec du"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:231
+#: scripts/dpkg-gencontrol.pl:242
 #, perl-format
 msgid "du in `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:232
+#: scripts/dpkg-gencontrol.pl:243
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:260
+#: scripts/dpkg-gencontrol.pl:271
 msgid "close old files list file"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:272
+#: scripts/dpkg-gencontrol.pl:283
 msgid "install new files list file"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:278
+#: scripts/dpkg-gencontrol.pl:289
 #, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:283
+#: scripts/dpkg-gencontrol.pl:294
 #, perl-format
 msgid "cannot install output control file `%s'"
 msgstr ""
 
-#: scripts/dpkg-parsechangelog.pl:22
-#, perl-format
+#: scripts/dpkg-parsechangelog.pl:23
 msgid ""
-"Debian dpkg-parsechangelog %s.\n"
+"\n"
 "Copyright (C) 1996 Ian Jackson.\n"
-"Copyright (C) 2001 Wichert Akkerman\n"
-"This is free software; see the GNU General Public Licence\n"
-"version 2 or later for copying conditions.  There is NO warranty.\n"
+"Copyright (C) 2001 Wichert Akkerman"
+msgstr ""
+
+#: scripts/dpkg-parsechangelog.pl:35
+#, perl-format
+msgid ""
+"Usage: %s [<option> ...]\n"
 "\n"
-"Usage: dpkg-parsechangelog [<option> ...]\n"
-"Options:  -l<changelogfile>      get per-version info from this file\n"
-"          -v<sinceversion>       include all changes later than version\n"
-"          -F<changelogformat>    force change log format\n"
-"          -L<libdir>             look for change log parsers in <libdir>\n"
-"          -h                     print this message\n"
+"Options:\n"
+"  -l<changelogfile>        get per-version info from this file.\n"
+"  -v<sinceversion>         include all changes later than version.\n"
+"  -F<changelogformat>      force change log format.\n"
+"  -L<libdir>               look for change log parsers in <libdir>.\n"
+"  -h, --help               show this help message.\n"
+"      --version            show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-parsechangelog.pl:51
+#: scripts/dpkg-parsechangelog.pl:62
 #, perl-format
 msgid "%s takes no non-option arguments"
 msgstr ""
 
-#: scripts/dpkg-parsechangelog.pl:56
+#: scripts/dpkg-parsechangelog.pl:67
 #, perl-format
 msgid "cannot open %s to find format: %s"
 msgstr ""
 
-#: scripts/dpkg-parsechangelog.pl:57
+#: scripts/dpkg-parsechangelog.pl:68
 #, perl-format
 msgid "cannot fork: %s"
 msgstr ""
 
-#: scripts/dpkg-parsechangelog.pl:62
+#: scripts/dpkg-parsechangelog.pl:73
 #, perl-format
 msgid "tail of %s"
 msgstr ""
 
-#: scripts/dpkg-parsechangelog.pl:69
+#: scripts/dpkg-parsechangelog.pl:80
 #, perl-format
 msgid "failed to check for format parser %s"
 msgstr ""
 
-#: scripts/dpkg-parsechangelog.pl:71
+#: scripts/dpkg-parsechangelog.pl:82
 #, perl-format
 msgid "format parser %s not executable"
 msgstr ""
 
-#: scripts/dpkg-parsechangelog.pl:78
+#: scripts/dpkg-parsechangelog.pl:89
 #, perl-format
 msgid "format %s unknown"
 msgstr ""
 
-#: scripts/dpkg-parsechangelog.pl:81
+#: scripts/dpkg-parsechangelog.pl:92
 #, perl-format
 msgid "cannot open %s: %s"
 msgstr ""
 
-#: scripts/dpkg-parsechangelog.pl:83
+#: scripts/dpkg-parsechangelog.pl:94
 #, perl-format
 msgid "cannot exec format parser: %s"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:62
+#: scripts/dpkg-scanpackages.pl:71
+#, perl-format
 msgid ""
-"dpkg-scanpackages [-u] [-a<arch>] [-m] binarypath overridefile [pathprefix] "
-"> Packages\n"
-"\n"
-" Options:\n"
-" --udeb, -u scan for udebs\n"
-" --arch, -a architecture to scan for\n"
-" --multiversion, -m allow multiple versions of a single package\n"
-" --help, -h show this help\n"
+"Usage: %s [<option> ...] <binarypath> <overridefile> [<pathprefix>] > "
+"Packages\n"
 "\n"
+"Options:\n"
+"  -u, --udeb               scan for udebs.\n"
+"  -a, --arch <arch>        architecture to scan for.\n"
+"  -m, --multiversion       allow multiple versions of a single package.\n"
+"  -h, --help               show this help message.\n"
+"      --version            show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:87
+#: scripts/dpkg-scanpackages.pl:97
 #, perl-format
 msgid "Binary dir %s not found"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:89
+#: scripts/dpkg-scanpackages.pl:99
 #, perl-format
 msgid "Override file %s not found"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:106
+#: scripts/dpkg-scanpackages.pl:116
 #, perl-format
 msgid "Couldn't open %s for reading: %s"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:114
+#: scripts/dpkg-scanpackages.pl:124
 #, perl-format
 msgid "Couldn't call dpkg-deb on %s: %s, skipping package"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:118
+#: scripts/dpkg-scanpackages.pl:128
 #, perl-format
 msgid "`dpkg-deb -I %s control' exited with %d, skipping package"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:132
+#: scripts/dpkg-scanpackages.pl:142
 #, perl-format
 msgid ""
 "Unprocessed text from %s control file; info:\n"
 "%s / %s\n"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:135
+#: scripts/dpkg-scanpackages.pl:145
 #, perl-format
 msgid "No Package field in control file of %s"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:142
+#: scripts/dpkg-scanpackages.pl:152
 #, perl-format
 msgid ""
 " ! Package %s (filename %s) is repeat but newer version;\n"
 "   used that one and ignored data from %s !\n"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:148
+#: scripts/dpkg-scanpackages.pl:158
 #, perl-format
 msgid ""
 " ! Package %s (filename %s) is repeat;\n"
 "   ignored that one and using data from %s !\n"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:155
+#: scripts/dpkg-scanpackages.pl:165
 #, perl-format
 msgid " ! Package %s (filename %s) has Filename field!\n"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:161
+#: scripts/dpkg-scanpackages.pl:171
 #, perl-format
 msgid "`md5sum < %s' exited with %d"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:162
+#: scripts/dpkg-scanpackages.pl:172
 #, perl-format
 msgid "Strange text from `md5sum < %s': `%s'"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:165
+#: scripts/dpkg-scanpackages.pl:175
 #, perl-format
 msgid "Couldn't stat %s: %s"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:166
+#: scripts/dpkg-scanpackages.pl:176
 #, perl-format
 msgid "%s is empty"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:200
+#: scripts/dpkg-scanpackages.pl:210
 #, perl-format
 msgid "Couldn't open override file %s: %s"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:222
+#: scripts/dpkg-scanpackages.pl:232
 #, perl-format
 msgid " * Unconditional maintainer override for %s *"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:248
+#: scripts/dpkg-scanpackages.pl:258
 #, perl-format
 msgid "Failed when writing stdout: %s"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:251
+#: scripts/dpkg-scanpackages.pl:261
 #, perl-format
 msgid "Couldn't close stdout: %s"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:255
+#: scripts/dpkg-scanpackages.pl:265
 msgid "** Packages in archive but missing from override file: **"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:259
+#: scripts/dpkg-scanpackages.pl:269
 msgid " ++ Packages in override file with incorrect old maintainer value: ++"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:265
+#: scripts/dpkg-scanpackages.pl:275
 msgid " -- Packages specifying same maintainer as override file: --"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:271
+#: scripts/dpkg-scanpackages.pl:281
 msgid " -- Packages in override file but not in archive: --"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:276
+#: scripts/dpkg-scanpackages.pl:286
 #, perl-format
 msgid " Wrote %s entries to output Packages file."
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:73
+#: scripts/dpkg-scansources.pl:102
 #, perl-format
 msgid ""
-"usage: %s [switch]... binary-dir [override-file [path-prefix]] > Sources\n"
+"Usage: %s [<option> ...] <binarypath> [<overridefile> [<pathprefix>]] > "
+"Sources\n"
 "\n"
-"switches:\n"
-"        --debug\t\tturn debugging on\n"
-"        --help\t\tshow this and then die\n"
-"    -n, --no-sort\tdon't sort by package before outputting\n"
-"    -s, --source-override file\n"
-"\t\t\tuse file for additional source overrides, default\n"
-"\t\t\tis regular override file with .src appended\n"
-"        --version\tshow the version and exit\n"
+"Options:\n"
+"  -n, --no-sort            don't sort by package before outputting.\n"
+"  -s, --source-override <file>\n"
+"                           use file for additional source overrides, "
+"default\n"
+"                           is regular override file with .src appended.\n"
+"      --debug              turn debugging on.\n"
+"      --help               show this help message.\n"
+"      --version            show the version.\n"
 "\n"
-"See the man page or `perldoc %s' for the full documentation.\n"
+"See the man page for the full documentation.\n"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:138
+#: scripts/dpkg-scansources.pl:142
 #, perl-format
 msgid "error closing %s ($? %d, $! `%s')"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:151
+#: scripts/dpkg-scansources.pl:155
 #, perl-format
 msgid "can't read override file %s:"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:160
+#: scripts/dpkg-scansources.pl:164
 #, perl-format
 msgid "invalid override entry at line %d (%d fields)"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:167
+#: scripts/dpkg-scansources.pl:171
 #, perl-format
 msgid "ignoring duplicate override entry for %s at line %d"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:173
+#: scripts/dpkg-scansources.pl:177
 #, perl-format
 msgid "ignoring override entry for %s, invalid priority %s"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:192
+#: scripts/dpkg-scansources.pl:196
 msgid "error closing override file:"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:213
+#: scripts/dpkg-scansources.pl:217
 #, perl-format
 msgid "can't read source override file %s:"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:223
+#: scripts/dpkg-scansources.pl:227
 #, perl-format
 msgid "invalid source override entry at line %d (%d fields)"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:232
+#: scripts/dpkg-scansources.pl:236
 #, perl-format
 msgid "ignoring duplicate source override entry for %s at line %d"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:239
+#: scripts/dpkg-scansources.pl:243
 msgid "error closing source override file:"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:253
+#: scripts/dpkg-scansources.pl:257
 #, perl-format
 msgid "%s has PGP start token but not end token"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:269
+#: scripts/dpkg-scansources.pl:273
 #, perl-format
 msgid "can't read %s:"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:275
+#: scripts/dpkg-scansources.pl:279
 #, perl-format
 msgid "error doing fstat on %s:"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:283
+#: scripts/dpkg-scansources.pl:287
 #, perl-format
 msgid "error reading from %s:"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:291 scripts/dpkg-scansources.pl:513
+#: scripts/dpkg-scansources.pl:295 scripts/dpkg-scansources.pl:517
 msgid "can't fork:"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:295
+#: scripts/dpkg-scansources.pl:299
 #, perl-format
 msgid "can't dup %s:"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:296
+#: scripts/dpkg-scansources.pl:300
 #, perl-format
 msgid "can't rewind %s:"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:297
+#: scripts/dpkg-scansources.pl:301
 msgid "can't exec md5sum:"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:306
+#: scripts/dpkg-scansources.pl:310
 #, perl-format
 msgid "invalid md5 output for %s (%s)"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:311
+#: scripts/dpkg-scansources.pl:315
 #, perl-format
 msgid "error closing %s:"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:336
+#: scripts/dpkg-scansources.pl:340
 #, perl-format
 msgid "%s invalid (contains blank line)"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:363
+#: scripts/dpkg-scansources.pl:367
 #, perl-format
 msgid "invalid field in %s: %s"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:371
+#: scripts/dpkg-scansources.pl:375
 #, perl-format
 msgid "duplicate source field in %s"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:375
+#: scripts/dpkg-scansources.pl:379
 #, perl-format
 msgid "invalid source field in %s"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:385
+#: scripts/dpkg-scansources.pl:389
 #, perl-format
 msgid "duplicate binary field in %s"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:390
+#: scripts/dpkg-scansources.pl:394
 #, perl-format
 msgid "no binary packages specified in %s"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:503
-msgid "1 to 3 args expected"
+#: scripts/dpkg-scansources.pl:507
+msgid "1 to 3 args expected\n"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:37
-#, perl-format
+#: scripts/dpkg-shlibdeps.pl:38
 msgid ""
-"Debian dpkg-shlibdeps %s.\n"
+"\n"
 "Copyright (C) 1996 Ian Jackson.\n"
 "Copyright (C) 2000 Wichert Akkerman.\n"
-"Copyright (C) 2006 Frank Lichtenheld.\n"
-"This is free software; see the GNU General Public Licence version 2 or\n"
-"later for copying conditions.  There is NO warranty.\n"
+"Copyright (C) 2006 Frank Lichtenheld."
+msgstr ""
+
+#: scripts/dpkg-shlibdeps.pl:51
+#, perl-format
+msgid ""
+"Usage: %s [<option> ...] <executable>|-e<executable> [<option> ...]\n"
 "\n"
-"Usage:\n"
-"  dpkg-shlibdeps [<option> ...] <executable>|-e<executable> [<option>] ...\n"
-"Positional arguments/options (order is significant):\n"
-"       <executable>           } include dependencies for <executable>\n"
-"       -e<executable>         }  (use -e if <executable> starts with `-')\n"
-"       -d<dependencyfield>    next executable(s) set shlibs:"
-"<dependencyfield>\n"
-"Overall options (have global effect no matter where placed):\n"
-"       -p<varnameprefix>      set <varnameprefix>:* instead of shlibs:*.\n"
-"       -O                     print variable settings to stdout\n"
-"       -L<localshlibsfile>    shlibs override file, not debian/shlibs.local\n"
-"       -T<varlistfile>        update variables here, not debian/substvars\n"
-"       -t<type>               set package type (default is deb)\n"
-"Dependency fields recognised are %s\n"
-msgstr ""
-
-#: scripts/dpkg-shlibdeps.pl:75
+"Positional options (order is significant):\n"
+"  <executable>             include dependencies for <executable>,\n"
+"  -e<executable>           (use -e if <executable> starts with `-')\n"
+"  -d<dependencyfield>      next executable(s) set shlibs:<dependencyfield>.\n"
+"\n"
+"Options:\n"
+"  -p<varnameprefix>        set <varnameprefix>:* instead of shlibs:*.\n"
+"  -O                       print variable settings to stdout.\n"
+"  -L<localshlibsfile>      shlibs override file, not debian/shlibs.local.\n"
+"  -T<varlistfile>          update variables here, not debian/substvars.\n"
+"  -t<type>                 set package type (default is deb).\n"
+"  -h, --help               show this help message.\n"
+"      --version            show the version.\n"
+"\n"
+"Dependency fields recognised are:\n"
+"  %s\n"
+msgstr ""
+
+#: scripts/dpkg-shlibdeps.pl:89
 #, perl-format
 msgid "unrecognised dependency field `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:87
+#: scripts/dpkg-shlibdeps.pl:101
 msgid "need at least one executable"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:90
+#: scripts/dpkg-shlibdeps.pl:104
 #, perl-format
 msgid "unable to open '%s' for test"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:93
+#: scripts/dpkg-shlibdeps.pl:107
 #, perl-format
 msgid "unable to read first four bytes of '%s' as magic number"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:106
+#: scripts/dpkg-shlibdeps.pl:120
 #, perl-format
 msgid "unrecognized file type for '%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:141
+#: scripts/dpkg-shlibdeps.pl:155
 #, perl-format
 msgid "couldn't open /etc/ld.so.conf: %s"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:159 scripts/dpkg-shlibdeps.pl:317
+#: scripts/dpkg-shlibdeps.pl:173 scripts/dpkg-shlibdeps.pl:331
 msgid "cannot fork for objdump"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:162 scripts/dpkg-shlibdeps.pl:320
+#: scripts/dpkg-shlibdeps.pl:176 scripts/dpkg-shlibdeps.pl:334
 msgid "cannot exec objdump"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:181
+#: scripts/dpkg-shlibdeps.pl:195
 #, perl-format
 msgid "format of `NEEDED %s' not recognized"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:187 scripts/dpkg-shlibdeps.pl:329
+#: scripts/dpkg-shlibdeps.pl:201 scripts/dpkg-shlibdeps.pl:343
 #, perl-format
 msgid "objdump on `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:249
+#: scripts/dpkg-shlibdeps.pl:263
 msgid "cannot fork for dpkg --search"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:255
+#: scripts/dpkg-shlibdeps.pl:269
 msgid "cannot exec dpkg"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:260
+#: scripts/dpkg-shlibdeps.pl:274
 msgid "diversions involved - output may be incorrect"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:261
+#: scripts/dpkg-shlibdeps.pl:275
 msgid "write diversion info to stderr"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:265
+#: scripts/dpkg-shlibdeps.pl:279
 #, perl-format
 msgid "unknown output from dpkg --search: `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:288
+#: scripts/dpkg-shlibdeps.pl:302
 #, perl-format
 msgid "could not find any packages for %s"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:298
+#: scripts/dpkg-shlibdeps.pl:312
 #, perl-format
 msgid ""
 "unable to find dependency information for shared library %s (soname %s, path "
 "%s, dependency field %s)"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:339
+#: scripts/dpkg-shlibdeps.pl:353
 #, perl-format
 msgid "unable to open shared libs info file `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:346
+#: scripts/dpkg-shlibdeps.pl:360
 #, perl-format
 msgid "shared libs info file `%s' line %d: bad line `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:381
+#: scripts/dpkg-shlibdeps.pl:395
 #, perl-format
 msgid "open new substvars file `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:384
+#: scripts/dpkg-shlibdeps.pl:398
 #, perl-format
 msgid "chown of `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:391
+#: scripts/dpkg-shlibdeps.pl:405
 #, perl-format
 msgid "copy old entry to new varlist file `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:394
+#: scripts/dpkg-shlibdeps.pl:408
 #, perl-format
 msgid "open old varlist file `%s' for reading"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:409
+#: scripts/dpkg-shlibdeps.pl:423
 msgid "write output entry"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:413
+#: scripts/dpkg-shlibdeps.pl:427
 msgid "write userdef output entry"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:415
+#: scripts/dpkg-shlibdeps.pl:429
 msgid "close output"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:418
+#: scripts/dpkg-shlibdeps.pl:432
 #, perl-format
 msgid "install new varlist file `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:62
+#: scripts/dpkg-source.pl:63
+msgid ""
+"\n"
+"Copyright (C) 1996 Ian Jackson and Klee Dienes."
+msgstr ""
+
+#: scripts/dpkg-source.pl:74
 #, perl-format
 msgid ""
-"Debian dpkg-source %s.  Copyright (C) 1996\n"
-"Ian Jackson and Klee Dienes.  This is free software; see the GNU\n"
-"General Public Licence version 2 or later for copying conditions.\n"
-"There is NO warranty.\n"
+"Usage: %s [<option> ...] <command>\n"
+"\n"
+"Commands:\n"
+"  -x <filename>.dsc [<output-dir>]\n"
+"                       extract source package.\n"
+"  -b <dir> [<orig-dir>|<orig-targz>|'']\n"
+"                       build source package.\n"
 "\n"
-"Usage:  dpkg-source -x <filename>.dsc [<output-directory>]\n"
-"        dpkg-source -b <directory> [<orig-directory>|<orig-targz>|'']\n"
-"Build options:   -c<controlfile>     get control info from this file\n"
-"                 -l<changelogfile>   get per-version info from this file\n"
-"                 -F<changelogformat> force change log format\n"
-"                 -V<name>=<value>    set a substitution variable\n"
-"                 -T<varlistfile>     read variables here, not debian/"
-"substvars\n"
-"                 -D<field>=<value>   override or add a .dsc field and value\n"
-"                 -U<field>           remove a field\n"
-"                 -W                  Turn certain errors into warnings. \n"
-"                 -E                  When -W is enabled, -E disables it.\n"
-"                 -q                  quiet operation, do not print "
-"warnings.\n"
-"                 -sa                 auto select orig source (-sA is "
-"default)\n"
-"                 -i[<regexp>]        filter out files to ignore diffs of.\n"
-"                                     Defaults to: '%s'\n"
-"                 -I<filename>        filter out files when building "
-"tarballs.\n"
-"                 -sk                 use packed orig source (unpack & keep)\n"
-"                 -sp                 use packed orig source (unpack & "
-"remove)\n"
-"                 -su                 use unpacked orig source (pack & keep)\n"
-"                 -sr                 use unpacked orig source (pack & "
-"remove)\n"
-"                 -ss                 trust packed & unpacked orig src are "
-"same\n"
-"                 -sn                 there is no diff, do main tarfile only\n"
-"                 -sA,-sK,-sP,-sU,-sR like -sa,-sp,-sk,-su,-sr but may "
-"overwrite\n"
-"Extract options: -sp (default)       leave orig source packed in current "
-"dir\n"
-"                 -sn                 do not copy original source to current "
-"dir\n"
-"                 -su                 unpack original source tree too\n"
-"General options: -h                  print this message\n"
-msgstr ""
-
-#: scripts/dpkg-source.pl:117
+"Build options:\n"
+"  -c<controlfile>          get control info from this file.\n"
+"  -l<changelogfile>        get per-version info from this file.\n"
+"  -F<changelogformat>      force change log format.\n"
+"  -V<name>=<value>         set a substitution variable.\n"
+"  -T<varlistfile>          read variables here, not debian/substvars.\n"
+"  -D<field>=<value>        override or add a .dsc field and value.\n"
+"  -U<field>                remove a field.\n"
+"  -W                       turn certain errors into warnings.\n"
+"  -E                       when -W is enabled, -E disables it.\n"
+"  -q                       quiet operation, do not print warnings.\n"
+"  -i[<regexp>]             filter out files to ignore diffs of\n"
+"                             (defaults to: '%s').\n"
+"  -I<filename>             filter out files when building tarballs.\n"
+"  -sa                      auto select orig source (-sA is default).\n"
+"  -sk                      use packed orig source (unpack & keep).\n"
+"  -sp                      use packed orig source (unpack & remove).\n"
+"  -su                      use unpacked orig source (pack & keep).\n"
+"  -sr                      use unpacked orig source (pack & remove).\n"
+"  -ss                      trust packed & unpacked orig src are same.\n"
+"  -sn                      there is no diff, do main tarfile only.\n"
+"  -sA,-sK,-sP,-sU,-sR      like -sa,-sk,-sp,-su,-sr but may overwrite.\n"
+"\n"
+"Extract options:\n"
+"  -sp (default)            leave orig source packed in current dir.\n"
+"  -sn                      do not copy original source to current dir.\n"
+"  -su                      unpack original source tree too.\n"
+"\n"
+"General options:\n"
+"  -h, --help               show this help message.\n"
+"      --version            show the version.\n"
+msgstr ""
+
+#: scripts/dpkg-source.pl:136
 #, perl-format
 msgid "-s%s option overrides earlier -s%s option"
 msgstr ""
 
-#: scripts/dpkg-source.pl:153
+#: scripts/dpkg-source.pl:174
 msgid "need -x or -b"
 msgstr ""
 
-#: scripts/dpkg-source.pl:161
+#: scripts/dpkg-source.pl:182
 #, perl-format
 msgid "source handling style -s%s not allowed with -b"
 msgstr ""
 
-#: scripts/dpkg-source.pl:163
+#: scripts/dpkg-source.pl:184
 msgid "-b needs a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:164
+#: scripts/dpkg-source.pl:185
 msgid "-b takes at most a directory and an orig source argument"
 msgstr ""
 
-#: scripts/dpkg-source.pl:167
+#: scripts/dpkg-source.pl:188
 #, perl-format
 msgid "cannot stat directory %s: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:168
+#: scripts/dpkg-source.pl:189
 #, perl-format
 msgid "directory argument %s is not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:209
+#: scripts/dpkg-source.pl:230
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr ""
 
-#: scripts/dpkg-source.pl:211
+#: scripts/dpkg-source.pl:232
 #, perl-format
 msgid "architecture %s only allowed on its own (list for package %s is `%s')"
 msgstr ""
 
-#: scripts/dpkg-source.pl:256
+#: scripts/dpkg-source.pl:277
 msgid "unable to determine source package name !"
 msgstr ""
 
-#: scripts/dpkg-source.pl:272
+#: scripts/dpkg-source.pl:293
 #, perl-format
 msgid "cannot stat orig argument %s: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:278
+#: scripts/dpkg-source.pl:299
 #, perl-format
 msgid ""
 "orig argument is unpacked but source handling style -s%s calls for packed (."
 "orig.tar.gz)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:284
+#: scripts/dpkg-source.pl:305
 #, perl-format
 msgid ""
 "orig argument is packed but source handling style -s%s calls for unpacked (."
 "orig/)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:292
+#: scripts/dpkg-source.pl:313
 #, perl-format
 msgid ""
 "orig argument is empty (means no orig, no diff) but source handling style -s%"
 "s wants something"
 msgstr ""
 
-#: scripts/dpkg-source.pl:299
+#: scripts/dpkg-source.pl:320
 #, perl-format
 msgid "packed orig `%s' exists but is not a plain file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:302
+#: scripts/dpkg-source.pl:323
 #, perl-format
 msgid "unable to stat putative packed orig `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:304
+#: scripts/dpkg-source.pl:325
 #, perl-format
 msgid "unpacked orig `%s' exists but is not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:307
+#: scripts/dpkg-source.pl:328
 #, perl-format
 msgid "unable to stat putative unpacked orig `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:313
+#: scripts/dpkg-source.pl:334
 #, perl-format
 msgid "source directory `%s' is not <sourcepackage>-<upstreamversion> `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:321
+#: scripts/dpkg-source.pl:342
 #, perl-format
 msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:328
+#: scripts/dpkg-source.pl:349
 #, perl-format
 msgid ""
 ".orig.tar.gz name %s is not <package>_<upstreamversion>.orig.tar.gz (wanted %"
 "s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:339
+#: scripts/dpkg-source.pl:360
 #, perl-format
 msgid ""
 "tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
 "override"
 msgstr ""
 
-#: scripts/dpkg-source.pl:342
+#: scripts/dpkg-source.pl:363
 #, perl-format
 msgid "unable to check for existence of `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:345 scripts/dpkg-source.pl:410
-#: scripts/dpkg-source.pl:554
+#: scripts/dpkg-source.pl:366 scripts/dpkg-source.pl:431
+#: scripts/dpkg-source.pl:575
 #, perl-format
 msgid "%s: building %s in %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:347
+#: scripts/dpkg-source.pl:368
 msgid "write building tar message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:351
+#: scripts/dpkg-source.pl:372
 msgid "fork for tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:353
+#: scripts/dpkg-source.pl:374
 #, perl-format
 msgid "chdir to above (orig) source %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:354
+#: scripts/dpkg-source.pl:375
 msgid "reopen gzip for tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:356
+#: scripts/dpkg-source.pl:377
 msgid "exec tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:360
+#: scripts/dpkg-source.pl:381
 msgid "wait for tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:363 scripts/dpkg-source.pl:517
+#: scripts/dpkg-source.pl:384 scripts/dpkg-source.pl:538
 #, perl-format
 msgid "unable to rename `%s' (newly created) to `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:365 scripts/dpkg-source.pl:519
+#: scripts/dpkg-source.pl:386 scripts/dpkg-source.pl:540
 #, perl-format
 msgid "unable to change permission of `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:369
+#: scripts/dpkg-source.pl:390
 #, perl-format
 msgid "%s: building %s using existing %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:371
+#: scripts/dpkg-source.pl:392
 msgid "write using existing tar message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:381
+#: scripts/dpkg-source.pl:402
 #, perl-format
 msgid ""
 "orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
 "sP to override"
 msgstr ""
 
-#: scripts/dpkg-source.pl:387
+#: scripts/dpkg-source.pl:408
 #, perl-format
 msgid "unable to check for existence of orig dir `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:396 scripts/dpkg-source.pl:726
+#: scripts/dpkg-source.pl:417 scripts/dpkg-source.pl:747
 #, perl-format
 msgid "unable to create `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:400 scripts/dpkg-source.pl:707
-#: scripts/dpkg-source.pl:732
+#: scripts/dpkg-source.pl:421 scripts/dpkg-source.pl:728
+#: scripts/dpkg-source.pl:753
 #, perl-format
 msgid "unable to rename `%s' to `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:404 scripts/dpkg-source.pl:734
+#: scripts/dpkg-source.pl:425 scripts/dpkg-source.pl:755
 #, perl-format
 msgid "unable to remove `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:412
+#: scripts/dpkg-source.pl:433
 msgid "write building diff message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:417
+#: scripts/dpkg-source.pl:438
 msgid "fork for find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:419
+#: scripts/dpkg-source.pl:440
 #, perl-format
 msgid "chdir to %s for find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:420
+#: scripts/dpkg-source.pl:441
 msgid "exec find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:429
+#: scripts/dpkg-source.pl:450
 #, perl-format
 msgid "cannot stat file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:435
+#: scripts/dpkg-source.pl:456
 #, perl-format
 msgid "cannot read link %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:437
+#: scripts/dpkg-source.pl:458
 #, perl-format
 msgid "cannot read orig link %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:438 scripts/dpkg-source.pl:439
+#: scripts/dpkg-source.pl:459 scripts/dpkg-source.pl:460
 #, perl-format
 msgid "symlink to %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:443 scripts/dpkg-source.pl:504
+#: scripts/dpkg-source.pl:464 scripts/dpkg-source.pl:525
 #, perl-format
 msgid "cannot stat orig file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:446
+#: scripts/dpkg-source.pl:467
 #, perl-format
 msgid "executable mode %04o of `%s' will not be represented in diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:450
+#: scripts/dpkg-source.pl:471
 #, perl-format
 msgid "special mode %04o of `%s' will not be represented in diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:455 scripts/dpkg-source.pl:1247
+#: scripts/dpkg-source.pl:476 scripts/dpkg-source.pl:1268
 msgid "something else"
 msgstr ""
 
-#: scripts/dpkg-source.pl:456
+#: scripts/dpkg-source.pl:477
 msgid "plain file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:459
+#: scripts/dpkg-source.pl:480
 msgid "fork for diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:467
+#: scripts/dpkg-source.pl:488
 msgid "exec diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:474
+#: scripts/dpkg-source.pl:495
 msgid "binary file contents changed"
 msgstr ""
 
-#: scripts/dpkg-source.pl:479
+#: scripts/dpkg-source.pl:500
 #, perl-format
 msgid "file %s has no final newline (either original or modified version)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:483
+#: scripts/dpkg-source.pl:504
 #, perl-format
 msgid "unknown line from diff -u on %s: `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:485
+#: scripts/dpkg-source.pl:506
 msgid "failed to write to gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:490
+#: scripts/dpkg-source.pl:511
 msgid "diff gave 1 but no diff lines found"
 msgstr ""
 
-#: scripts/dpkg-source.pl:493
+#: scripts/dpkg-source.pl:514
 #, perl-format
 msgid "diff on %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:499
+#: scripts/dpkg-source.pl:520
 msgid "device or socket is not allowed"
 msgstr ""
 
-#: scripts/dpkg-source.pl:506
+#: scripts/dpkg-source.pl:527
 msgid "not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:507
+#: scripts/dpkg-source.pl:528
 msgid "directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:510
+#: scripts/dpkg-source.pl:531
 #, perl-format
 msgid "unknown file type (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:514
+#: scripts/dpkg-source.pl:535
 msgid "finish write to gzip pipe"
 msgstr ""
 
-#: scripts/dpkg-source.pl:521
+#: scripts/dpkg-source.pl:542
 msgid "fork for 2nd find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:523
+#: scripts/dpkg-source.pl:544
 #, perl-format
 msgid "chdir to %s for 2nd find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:524
+#: scripts/dpkg-source.pl:545
 msgid "exec 2nd find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:532
+#: scripts/dpkg-source.pl:553
 #, perl-format
 msgid "cannot check orig file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:534
+#: scripts/dpkg-source.pl:555
 #, perl-format
 msgid "ignoring deletion of file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:536
+#: scripts/dpkg-source.pl:557
 #, perl-format
 msgid "ignoring deletion of directory %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:538
+#: scripts/dpkg-source.pl:559
 #, perl-format
 msgid "ignoring deletion of symlink %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:540
+#: scripts/dpkg-source.pl:561
 msgid "not a file, directory or link"
 msgstr ""
 
-#: scripts/dpkg-source.pl:541 scripts/dpkg-source.pl:1243
+#: scripts/dpkg-source.pl:562 scripts/dpkg-source.pl:1264
 msgid "nonexistent"
 msgstr ""
 
-#: scripts/dpkg-source.pl:556
+#: scripts/dpkg-source.pl:577
 msgid "write building message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:557
+#: scripts/dpkg-source.pl:578
 #, perl-format
 msgid "create %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:561
+#: scripts/dpkg-source.pl:582
 #, perl-format
 msgid "%s: unrepresentable changes to source"
 msgstr ""
 
-#: scripts/dpkg-source.pl:563
+#: scripts/dpkg-source.pl:584
 #, perl-format
 msgid "write error msg: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:572
+#: scripts/dpkg-source.pl:593
 #, perl-format
 msgid "source handling style -s%s not allowed with -x"
 msgstr ""
 
-#: scripts/dpkg-source.pl:574
+#: scripts/dpkg-source.pl:595
 msgid "-x needs at least one argument, the .dsc"
 msgstr ""
 
-#: scripts/dpkg-source.pl:575
+#: scripts/dpkg-source.pl:596
 msgid "-x takes no more than two arguments"
 msgstr ""
 
-#: scripts/dpkg-source.pl:579
+#: scripts/dpkg-source.pl:600
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:584
+#: scripts/dpkg-source.pl:605
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:608
+#: scripts/dpkg-source.pl:629
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:612
+#: scripts/dpkg-source.pl:633
 #, perl-format
 msgid "could not verify signature on %s since gpg isn't installed"
 msgstr ""
 
-#: scripts/dpkg-source.pl:615
+#: scripts/dpkg-source.pl:636
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:619
+#: scripts/dpkg-source.pl:640
 #, perl-format
 msgid "source control file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:624
+#: scripts/dpkg-source.pl:645
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:630
+#: scripts/dpkg-source.pl:651
 #, perl-format
 msgid "Unsupported format of .dsc file (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:659
+#: scripts/dpkg-source.pl:680
 #, perl-format
 msgid "Files field contains invalid filename `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:664
+#: scripts/dpkg-source.pl:685
 #, perl-format
 msgid "repeated file type - files `%s' and `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:677
+#: scripts/dpkg-source.pl:698
 #, perl-format
 msgid "unrecognised file type - `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:681
+#: scripts/dpkg-source.pl:702
 msgid "no tarfile in Files field"
 msgstr ""
 
-#: scripts/dpkg-source.pl:684
+#: scripts/dpkg-source.pl:705
 msgid "multiple tarfiles in native package"
 msgstr ""
 
-#: scripts/dpkg-source.pl:685
+#: scripts/dpkg-source.pl:706
 msgid "native package with .orig.tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:688
+#: scripts/dpkg-source.pl:709
 msgid "no upstream tarfile in Files field"
 msgstr ""
 
-#: scripts/dpkg-source.pl:690
+#: scripts/dpkg-source.pl:711
 #, perl-format
 msgid "multiple upstream tarballs in %s format dsc"
 msgstr ""
 
-#: scripts/dpkg-source.pl:691
+#: scripts/dpkg-source.pl:712
 #, perl-format
 msgid "debian.tar in %s format dsc"
 msgstr ""
 
-#: scripts/dpkg-source.pl:700
+#: scripts/dpkg-source.pl:721
 #, perl-format
 msgid "%s: extracting %s in %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:702
+#: scripts/dpkg-source.pl:723
 msgid "write extracting message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:728
+#: scripts/dpkg-source.pl:749
 #, perl-format
 msgid "%s: unpacking %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:742
+#: scripts/dpkg-source.pl:763
 #, perl-format
 msgid "failed to stat `%s' to see if need to copy"
 msgstr ""
 
-#: scripts/dpkg-source.pl:745
+#: scripts/dpkg-source.pl:766
 #, perl-format
 msgid "failed to check destination `%s' to see if need to copy"
 msgstr ""
 
-#: scripts/dpkg-source.pl:758
+#: scripts/dpkg-source.pl:779
 msgid "unable to keep orig directory (already exists)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:792 scripts/dpkg-source.pl:848
+#: scripts/dpkg-source.pl:813 scripts/dpkg-source.pl:869
 #, perl-format
 msgid "cannot stat %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:794
+#: scripts/dpkg-source.pl:815
 #, perl-format
 msgid "failed to create %s subdirectory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:797
+#: scripts/dpkg-source.pl:818
 #, perl-format
 msgid "diff patches file in directory `%s', but %s isn't a directory !"
 msgstr ""
 
-#: scripts/dpkg-source.pl:806
+#: scripts/dpkg-source.pl:827
 #, perl-format
 msgid "failed to rename newly-extracted %s to %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:811
+#: scripts/dpkg-source.pl:832
 #, perl-format
 msgid "failed to rename saved %s to %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:815
+#: scripts/dpkg-source.pl:836
 #, perl-format
 msgid "%s: applying %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:820 scripts/dpkg-source.pl:1123
+#: scripts/dpkg-source.pl:841 scripts/dpkg-source.pl:1144
 #, perl-format
 msgid "can't open diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:823
+#: scripts/dpkg-source.pl:844
 msgid "fork for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:825
+#: scripts/dpkg-source.pl:846
 msgid "reopen gzip for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:826
+#: scripts/dpkg-source.pl:847
 #, perl-format
 msgid "chdir to %s for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:830
+#: scripts/dpkg-source.pl:851
 msgid "exec patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:833
+#: scripts/dpkg-source.pl:854
 msgid "wait for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:842
+#: scripts/dpkg-source.pl:863
 #, perl-format
 msgid "cannot change timestamp for %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:844
+#: scripts/dpkg-source.pl:865
 #, perl-format
 msgid "remove patch backup file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:849
+#: scripts/dpkg-source.pl:870
 #, perl-format
 msgid "%s does not exist"
 msgstr ""
 
-#: scripts/dpkg-source.pl:852
+#: scripts/dpkg-source.pl:873
 #, perl-format
 msgid "cannot make %s executable"
 msgstr ""
 
-#: scripts/dpkg-source.pl:854
+#: scripts/dpkg-source.pl:875
 #, perl-format
 msgid "%s is not a plain file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:858
+#: scripts/dpkg-source.pl:879
 msgid "cannot stat `.'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:864
+#: scripts/dpkg-source.pl:885
 #, perl-format
 msgid "cannot stat extracted object `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:873
+#: scripts/dpkg-source.pl:894
 #, perl-format
 msgid "unknown object `%s' after extract (mode 0%o)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:877
+#: scripts/dpkg-source.pl:898
 #, perl-format
 msgid "cannot change mode of `%s' to 0%o from 0%o"
 msgstr ""
 
-#: scripts/dpkg-source.pl:887
+#: scripts/dpkg-source.pl:908
 #, perl-format
 msgid "cannot read %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:888
+#: scripts/dpkg-source.pl:909
 #, perl-format
 msgid "cannot fstat %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:889
+#: scripts/dpkg-source.pl:910
 #, perl-format
 msgid "file %s has size %s instead of expected %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:892
+#: scripts/dpkg-source.pl:913
 #, perl-format
 msgid "file %s has md5sum %s instead of expected %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:893
+#: scripts/dpkg-source.pl:914
 msgid "reopen stdin from /dev/null"
 msgstr ""
 
-#: scripts/dpkg-source.pl:900
+#: scripts/dpkg-source.pl:921
 #, perl-format
 msgid "cannot stat directory %s (before removal)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:906
+#: scripts/dpkg-source.pl:927
 #, perl-format
 msgid "unable to check for removal of dir `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:908
+#: scripts/dpkg-source.pl:929
 #, perl-format
 msgid "rm -rf failed to remove `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:922
+#: scripts/dpkg-source.pl:943
 msgid "fork for cpio"
 msgstr ""
 
-#: scripts/dpkg-source.pl:926
+#: scripts/dpkg-source.pl:947
 msgid "reopen gzip for cpio"
 msgstr ""
 
-#: scripts/dpkg-source.pl:928
+#: scripts/dpkg-source.pl:949
 msgid "exec cpio"
 msgstr ""
 
-#: scripts/dpkg-source.pl:942
+#: scripts/dpkg-source.pl:963
 #, perl-format
 msgid "tarfile `%s' contains object with newline in its name (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:950
+#: scripts/dpkg-source.pl:971
 #, perl-format
 msgid ""
 "first output from cpio -0t (from `%s') contains newline - you probably have "
 "an out of date version of cpio.  GNU cpio 2.4.2-2 is known to work"
 msgstr ""
 
-#: scripts/dpkg-source.pl:958
+#: scripts/dpkg-source.pl:979
 #, perl-format
 msgid ""
 "tarfile `%s' does not extract into a directory off the current directory (%s "
 "from %s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:967
+#: scripts/dpkg-source.pl:988
 #, perl-format
 msgid "tarfile `%s' contains object (%s) not in expected directory (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:974
+#: scripts/dpkg-source.pl:995
 #, perl-format
 msgid "tarfile `%s' contains object with /../ in its name (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1002
+#: scripts/dpkg-source.pl:1023
 msgid "fork for tar -t"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1006
+#: scripts/dpkg-source.pl:1027
 msgid "reopen gzip for tar -t"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1007
+#: scripts/dpkg-source.pl:1028
 msgid "exec tar -vvtf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1017
+#: scripts/dpkg-source.pl:1038
 #, perl-format
 msgid "tarfile `%s' contains unknown object listed by tar as `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1024
+#: scripts/dpkg-source.pl:1045
 #, perl-format
 msgid "tarfile `%s' contains object `%s' with unknown or forbidden type `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1034
+#: scripts/dpkg-source.pl:1055
 #, perl-format
 msgid "tarfile `%s' contains incomplete entry `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1057
+#: scripts/dpkg-source.pl:1078
 #, perl-format
 msgid "filename `%s' was truncated by cpio; unable to check full pathname"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1064
+#: scripts/dpkg-source.pl:1085
 #, perl-format
 msgid ""
 "tarfile `%s' contains unexpected object listed by tar as `%s'; expected `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1073
+#: scripts/dpkg-source.pl:1094
 #, perl-format
 msgid "tarfile `%s' contains object with/../ in its name (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1078
+#: scripts/dpkg-source.pl:1099
 #, perl-format
 msgid "tarfile `%s' contains file with name ending in .dpkg-orig"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1082
+#: scripts/dpkg-source.pl:1103
 #, perl-format
 msgid "tarfile `%s' contains setuid, setgid or sticky object `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1087
+#: scripts/dpkg-source.pl:1108
 #, perl-format
 msgid "tarfile `%s' contains object `debian' that isn't a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1096
+#: scripts/dpkg-source.pl:1117
 #, perl-format
 msgid ""
 "tarfile `%s' contains object `%s' but its containing directory `%s' does not "
 "precede it"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1135 scripts/dpkg-source.pl:1172
-#: scripts/dpkg-source.pl:1181
+#: scripts/dpkg-source.pl:1156 scripts/dpkg-source.pl:1193
+#: scripts/dpkg-source.pl:1202
 #, perl-format
 msgid "diff `%s' is missing trailing newline"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1136
+#: scripts/dpkg-source.pl:1157
 #, perl-format
 msgid "expected ^--- in line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1139
+#: scripts/dpkg-source.pl:1160
 #, perl-format
 msgid "diff `%s' patches file with no subdirectory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1141
+#: scripts/dpkg-source.pl:1162
 #, perl-format
 msgid "diff `%s' patches file with name ending .dpkg-orig"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1145
+#: scripts/dpkg-source.pl:1166
 #, perl-format
 msgid "diff `%s' finishes in middle of ---/+++ (line %d)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1149 scripts/dpkg-source.pl:1155
+#: scripts/dpkg-source.pl:1170 scripts/dpkg-source.pl:1176
 #, perl-format
 msgid "line after --- isn't as expected in diff `%s' (line %d)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1163
+#: scripts/dpkg-source.pl:1184
 #, perl-format
 msgid "diff `%s' patches something which is not a plain file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1165
+#: scripts/dpkg-source.pl:1186
 #, perl-format
 msgid "diff patches file %s twice"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1175
+#: scripts/dpkg-source.pl:1196
 #, perl-format
 msgid "Expected ^@@ in line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1180
+#: scripts/dpkg-source.pl:1201
 #, perl-format
 msgid "unexpected end of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1186
+#: scripts/dpkg-source.pl:1207
 #, perl-format
 msgid "expected [ +-] at start of line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1189
+#: scripts/dpkg-source.pl:1210
 #, perl-format
 msgid "expected ^@@ at line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1199
+#: scripts/dpkg-source.pl:1220
 msgid "fork for tar -xkf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1201
+#: scripts/dpkg-source.pl:1222
 msgid "reopen gzip for tar -xkf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1203
+#: scripts/dpkg-source.pl:1224
 #, perl-format
 msgid "cannot chdir to `%s' for tar extract"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1204
+#: scripts/dpkg-source.pl:1225
 msgid "exec tar -xkf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1207
+#: scripts/dpkg-source.pl:1228
 msgid "wait for tar -xkf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1211
+#: scripts/dpkg-source.pl:1232
 #, perl-format
 msgid "Unable to open dir %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1213
+#: scripts/dpkg-source.pl:1234
 #, perl-format
 msgid "Unable to close dir %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1216 scripts/dpkg-source.pl:1225
-#: scripts/dpkg-source.pl:1230
+#: scripts/dpkg-source.pl:1237 scripts/dpkg-source.pl:1246
+#: scripts/dpkg-source.pl:1251
 #, perl-format
 msgid "Unable to rename %s to %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1221
+#: scripts/dpkg-source.pl:1242
 #, perl-format
 msgid "Unable to mkdir %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1238
+#: scripts/dpkg-source.pl:1259
 msgid "reopen stderr for tar to grep out blocks message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1245
+#: scripts/dpkg-source.pl:1266
 #, perl-format
 msgid "checktype %s (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1253
+#: scripts/dpkg-source.pl:1274
 msgid "only one of -x or -b allowed, and only once"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1258
+#: scripts/dpkg-source.pl:1279
 #, perl-format
 msgid "%s: cannot represent change to %s: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1260 scripts/dpkg-source.pl:1269
+#: scripts/dpkg-source.pl:1281 scripts/dpkg-source.pl:1290
 msgid "write syserr unrep"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1265
+#: scripts/dpkg-source.pl:1286
 #, perl-format
 msgid ""
 "%s: cannot represent change to %s:\n"
@@ -2095,165 +2131,166 @@ msgid ""
 "%s:  old version is %s\n"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1274
+#: scripts/dpkg-source.pl:1295
 #, perl-format
 msgid "create file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1275
+#: scripts/dpkg-source.pl:1296
 msgid "pipe for gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1276
+#: scripts/dpkg-source.pl:1297
 msgid "fork for gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1278
+#: scripts/dpkg-source.pl:1299
 msgid "reopen gzip pipe"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1279
+#: scripts/dpkg-source.pl:1300
 msgid "reopen tar.gz"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1280
+#: scripts/dpkg-source.pl:1301
 msgid "exec gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1289
+#: scripts/dpkg-source.pl:1310
 #, perl-format
 msgid "read file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1290
+#: scripts/dpkg-source.pl:1311
 #, perl-format
 msgid "pipe for %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1291
+#: scripts/dpkg-source.pl:1312
 #, perl-format
 msgid "fork for %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1293
+#: scripts/dpkg-source.pl:1314
 #, perl-format
 msgid "reopen %s pipe"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1294
+#: scripts/dpkg-source.pl:1315
 msgid "reopen input file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1295
+#: scripts/dpkg-source.pl:1316
 #, perl-format
 msgid "exec %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1302
+#: scripts/dpkg-source.pl:1323
 msgid "wait for gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1312
+#: scripts/dpkg-source.pl:1333
 #, perl-format
 msgid "tried to add file `%s' twice"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1313
+#: scripts/dpkg-source.pl:1334
 #, perl-format
 msgid "could not stat output file `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1334
+#: scripts/dpkg-source.pl:1355
 #, perl-format
 msgid "bogus character `\\%s' in `%s'"
 msgstr ""
 
-#: scripts/changelog/debian.pl:27
+#: scripts/changelog/debian.pl:38
 #, perl-format
 msgid ""
-"Debian %s %s.  Copyright (C) 1996\n"
-"Ian Jackson.  This is free software; see the GNU General Public Licence\n"
-"version 2 or later for copying conditions.  There is NO warranty.\n"
+"Usage: %s [<option>]\n"
 "\n"
-"Usage: %s [-v<versionsince>] | -h\n"
+"Options:\n"
+"  -v<versionsince>    print changes since <versionsince>.\n"
+"  -h, --help          print this help message.\n"
+"      --version       print program version.\n"
 msgstr ""
 
-#: scripts/changelog/debian.pl:42
+#: scripts/changelog/debian.pl:56
 #, perl-format
 msgid "unknown option or argument `%s'"
 msgstr ""
 
-#: scripts/changelog/debian.pl:63
+#: scripts/changelog/debian.pl:77
 msgid "-v<since> option specifies most recent version"
 msgstr ""
 
-#: scripts/changelog/debian.pl:70
+#: scripts/changelog/debian.pl:84
 #, perl-format
 msgid "found start of entry where expected %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:76
+#: scripts/changelog/debian.pl:90
 #, perl-format
 msgid "bad key-value after `;': `%s'"
 msgstr ""
 
-#: scripts/changelog/debian.pl:78
+#: scripts/changelog/debian.pl:92
 #, perl-format
 msgid "repeated key-value %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:81
+#: scripts/changelog/debian.pl:95
 msgid "badly formatted urgency value, at changelog "
 msgstr ""
 
-#: scripts/changelog/debian.pl:85
+#: scripts/changelog/debian.pl:99
 #, perl-format
 msgid "unknown urgency value %s - comparing very low"
 msgstr ""
 
-#: scripts/changelog/debian.pl:88
+#: scripts/changelog/debian.pl:102
 #, perl-format
 msgid "urgency >%s<"
 msgstr ""
 
-#: scripts/changelog/debian.pl:106
+#: scripts/changelog/debian.pl:120
 #, perl-format
 msgid "unknown key-value key %s - copying to %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:113
+#: scripts/changelog/debian.pl:127
 msgid "badly formatted heading line"
 msgstr ""
 
-#: scripts/changelog/debian.pl:116
+#: scripts/changelog/debian.pl:130
 #, perl-format
 msgid "found trailer where expected %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:123
+#: scripts/changelog/debian.pl:137
 msgid "badly formatted trailer line"
 msgstr ""
 
-#: scripts/changelog/debian.pl:126
+#: scripts/changelog/debian.pl:140
 #, perl-format
 msgid "found change data where expected %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:132
+#: scripts/changelog/debian.pl:146
 #, perl-format
 msgid "found blank line where expected %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:135
+#: scripts/changelog/debian.pl:149
 msgid "unrecognised line"
 msgstr ""
 
-#: scripts/changelog/debian.pl:139
+#: scripts/changelog/debian.pl:153
 #, perl-format
 msgid "found eof where expected %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:151 scripts/changelog/debian.pl:152
+#: scripts/changelog/debian.pl:165 scripts/changelog/debian.pl:166
 #, perl-format
 msgid "%s, at changelog line %d"
 msgstr ""
diff --git a/scripts/update-alternatives.pl b/scripts/update-alternatives.pl
index 20729649a..9e9c0a705 100755
--- a/scripts/update-alternatives.pl
+++ b/scripts/update-alternatives.pl
@@ -7,6 +7,8 @@ push (@INC, $dpkglibdir);
 require 'dpkg-gettext.pl';
 textdomain("dpkg");
 
+($0) = $0 =~ m:.*/(.+):;
+
 # Global variables:
 #  $alink            Alternative we are managing (ie the symlink we're making/removing) (install only)
 #  $name             Name of the alternative (the symlink) we are processing
@@ -31,36 +33,54 @@ textdomain("dpkg");
 $enoent=`$dpkglibdir/enoent` || die sprintf(_g("Cannot get ENOENT value from %s: %s"), "$dpkglibdir/enoent", $!);
 sub ENOENT { $enoent; }
 
-sub usageversion {
-    printf(STDERR _g(<<END), $version)
-Debian update-alternatives %s.
+sub version {
+    printf _g("Debian %s version %s.\n"), $0, $version;
+
+    printf _g("
 Copyright (C) 1995 Ian Jackson.
-Copyright (C) 2000-2002 Wichert Akkerman
-This is free software; see the GNU General Public Licence
-version 2 or later for copying conditions.  There is NO warranty.
-
-Usage: update-alternatives --install <link> <name> <path> <priority>
-                          [--slave <link> <name> <path>] ...
-       update-alternatives --remove <name> <path>
-       update-alternatives --remove-all <name>
-       update-alternatives --auto <name>
-       update-alternatives --display <name>
-       update-alternatives --list <name>
-       update-alternatives --config <name>
-       update-alternatives --set <name> <path>
-       update-alternatives --all
+Copyright (C) 2000-2002 Wichert Akkerman.");
+
+    printf _g("
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO warranty.
+");
+}
+
+sub usage {
+    printf _g(
+"Usage: %s [<option> ...] <command>
+
+Commands:
+  --install <link> <name> <path> <priority>
+    [--slave <link> <name> <path>] ...
+                           add a group of alternativse to the system.
+  --remove <name> <path>   remove <path> from the <name> group alternative.
+  --remove-all <name>      remove <name> group from the alternatives system.
+  --auto <name>            switch the master link <name> to automatic mode.
+  --display <name>         display information about the <name> group.
+  --list <name>            display all targets of the <name> group.
+  --config <name>          show alternatives for the <name> group and ask the
+                           user to select which one to use.
+  --set <name> <path>      set <path> as alternative for <name>.
+  --all                    call --config on all alternatives.
+
 <name> is the name in /etc/alternatives.
 <path> is the name referred to.
 <link> is the link pointing to /etc/alternatives/<name>.
 <priority> is an integer; options with higher numbers are chosen.
 
-Options:  --verbose|--quiet  --test  --help  --version
-          --altdir <directory>  --admindir <directory>
-END
-        || &quit(sprintf(_g("failed to write usage: %s"), $!));
+Options:
+  --altdir <directory>     change the alternatives directory.
+  --admindir <directory>   change the administrative directory.
+  --test                   don't do anything, just demonstrate.
+  --verbose                verbose operation, more output.
+  --quiet                  quiet operation, minimal output.
+  --help                   show this help message.
+  --version                show the version.
+"), $0;
 }
 sub quit {printf STDERR _g("update-alternatives: %s")."\n", "@_"; exit(2);}
-sub badusage { printf STDERR _g("update-alternatives: %s")."\n\n", "@_"; &usageversion; exit(2); }
+sub badusage { printf STDERR _g("update-alternatives: %s")."\n\n", "@_"; &usage; exit(2); }
 
 $altdir= '/etc/alternatives';
 $admindir= $admindir . '/alternatives';
@@ -80,8 +100,10 @@ while (@ARGV) {
     last if m/^--$/;
     if (!m/^--/) {
         &quit(sprintf(_g("unknown argument \`%s'"), $_));
-    } elsif (m/^--(help|version)$/) {
-        &usageversion; exit(0);
+    } elsif (m/^--help$/) {
+        &usage; exit(0);
+    } elsif (m/^--version$/) {
+        &version; exit(0);
     } elsif (m/^--test$/) {
         $testmode= 1;
     } elsif (m/^--verbose$/) {