scripts: Slice --help output strings

Use to opportunity that the strings have been modified in previous
commits to slice them, which should make translation a slightly more
manageable work in the future. It should also get identical strings
coalesced so that there's less to translate.

scripts/dpkg-architecture.pl

@@ -44,15 +44,15 @@ later for copying conditions. There is NO warranty.
 
 sub usage {
     printf _g(
-"Usage: %s [<option>...] [<command>]
-
-Options:
+"Usage: %s [<option>...] [<command>]")
+    . "\n\n" . _g(
+"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).
-
-Commands:
+  -f                 force flag (override variables set in environment).")
+    . "\n\n" . _g(
+"Commands:
   -l                 list variables (default).
   -e<debian-arch>    compare with current Debian architecture.
   -i<arch-alias>     check if current Debian architecture is <arch-alias>.

scripts/dpkg-buildflags.pl

@@ -38,9 +38,9 @@ later for copying conditions. There is NO warranty.
 
 sub usage {
     printf _g(
-"Usage: %s [<command>]
-
-Commands:
+"Usage: %s [<command>]")
+    . "\n\n" . _g(
+"Commands:
   --get <flag>       output the requested flag to stdout.
   --origin <flag>    output the origin of the flag to stdout:
                      value is one of vendor, system, user, env.

scripts/dpkg-buildpackage.pl

@@ -50,9 +50,9 @@ later for copying conditions. There is NO warranty.
 
 sub usage {
     printf _g(
-"Usage: %s [<option>...]
-
-Options:
+"Usage: %s [<option>...]")
+    . "\n\n" . _g(
+"Options:
   -F (default)   normal full build (binaries and sources).
   -b             binary-only, do not build source.
   -B             binary-only, no arch-indep files.
@@ -77,13 +77,13 @@ Options:
       --admindir=<directory>
                  change the administrative directory.
   -h, --help     show this help message.
-      --version  show the version.
-
-Options passed to dpkg-architecture:
+      --version  show the version.")
+    . "\n\n" . _g(
+"Options passed to dpkg-architecture:
   -a<arch>       Debian architecture we build for (implies -d).
-  -t<system>     set GNU system type.
-
-Options passed to dpkg-genchanges:
+  -t<system>     set GNU system type.")
+    . "\n\n" . _g(
+"Options passed to dpkg-genchanges:
   -si (default)  source includes orig if new upstream.
   -sa            uploaded source always includes orig.
   -sd            uploaded source is diff and .dsc only.
@@ -92,9 +92,9 @@ Options passed to dpkg-genchanges:
   -e<maint>      maintainer for release is <maint>.
   -C<descfile>   changes are described in <descfile>.
       --changes-option=<opt>
-                 pass option <opt> to dpkg-genchanges.
-
-Options passed to dpkg-source:
+                 pass option <opt> to dpkg-genchanges.")
+    . "\n\n" . _g(
+"Options passed to dpkg-source:
   -sn            force Debian native source format.
   -s[sAkurKUR]   see dpkg-source for explanation.
   -z<level>      compression level to use fo source.

scripts/dpkg-genchanges.pl

@@ -106,9 +106,9 @@ later for copying conditions. There is NO warranty.
 
 sub usage {
     printf _g(
-"Usage: %s [<option>...]
-
-Options:
+"Usage: %s [<option>...]")
+    . "\n\n" . _g(
+"Options:
   -b                       binary-only build - no source files.
   -B                       arch-specific - no source or arch-indep files.
   -A                       only arch-indep - no source or arch-specific files.

scripts/dpkg-gencontrol.pl

@@ -69,9 +69,9 @@ later for copying conditions. There is NO warranty.
 
 sub usage {
     printf _g(
-"Usage: %s [<option>...]
-
-Options:
+"Usage: %s [<option>...]")
+    . "\n\n" . _g(
+"Options:
   -p<package>              print control file for package.
   -c<control-file>         get control info from this file.
   -l<changelog-file>       get per-version info from this file.

scripts/dpkg-gensymbols.pl

@@ -60,9 +60,9 @@ later for copying conditions. There is NO warranty.
 
 sub usage {
     printf _g(
-"Usage: %s [<option>...]
-
-Options:
+"Usage: %s [<option>...]")
+    . "\n\n" . _g(
+"Options:
   -p<package>              generate symbols file for package.
   -P<package-build-dir>    temporary build dir instead of debian/tmp.
   -e<library>              explicitly list libraries to scan.

scripts/dpkg-parsechangelog.pl

@@ -41,16 +41,16 @@ later for copying conditions. There is NO warranty.
 
 sub usage {
     printf _g(
-"Usage: %s [<option>...]
-
-Options:
+"Usage: %s [<option>...]")
+    . "\n\n" . _g(
+"Options:
   -l<changelog-file>       get per-version info from this file.
   -F<changelog-format>     force changelog format.
   -L<libdir>               look for changelog parsers in <libdir>.
   -h, --help               show this help message.
-      --version            show the version.
-
-Parser options:
+      --version            show the version.")
+    . "\n\n" . _g(
+"Parser options:
     --format <output-format>    see man page for list of available
                                 output formats, defaults to 'dpkg'
                                 for compatibility with dpkg-dev

scripts/dpkg-shlibdeps.pl

@@ -547,14 +547,14 @@ later for copying conditions. There is NO warranty.
 
 sub usage {
     printf _g(
-"Usage: %s [<option>...] <executable>|-e<executable> [<option>...]
-
-Positional options (order is significant):
+"Usage: %s [<option>...] <executable>|-e<executable> [<option>...]")
+    . "\n\n" . _g(
+"Positional options (order is significant):
   <executable>             include dependencies for <executable>,
   -e<executable>           (use -e if <executable> starts with '-')
-  -d<dependency-field>     next executable(s) set shlibs:<dependency-field>.
-
-Options:
+  -d<dependency-field>     next executable(s) set shlibs:<dependency-field>.")
+    . "\n\n" . _g(
+"Options:
   -p<varname-prefix>       set <varname-prefix>:* instead of shlibs:*.
   -O                       print variable settings to stdout.
   -L<local-shlibs-file>    shlibs override file, not debian/shlibs.local.
@@ -568,9 +568,9 @@ Options:
   --warnings=<value>       define set of active warnings (see manual page).
   --admindir=<directory>   change the administrative directory.
   -h, --help               show this help message.
-      --version            show the version.
-
-Dependency fields recognised are:
+      --version            show the version.")
+    . "\n\n" . _g(
+"Dependency fields recognised are:
   %s
 "), $progname, join("/",@depfields);
 }

scripts/dpkg-source.pl

@@ -462,9 +462,9 @@ later for copying conditions. There is NO warranty.
 
 sub usage {
     printf _g(
-"Usage: %s [<option>...] <command>
-
-Commands:
+"Usage: %s [<option>...] <command>")
+    . "\n\n" . _g(
+"Commands:
   -x <filename>.dsc [<output-dir>]
                            extract source package.
   -b <dir>                 build source package.

scripts/dpkg-vendor.pl

@@ -38,12 +38,12 @@ later for copying conditions. There is NO warranty.
 
 sub usage {
     printf _g(
-"Usage: %s [<option>...] [<command>]
-
-Options:
-  --vendor <vendor>       assume <vendor> is the current vendor
-
-Commands:
+"Usage: %s [<option>...] [<command>]")
+    . "\n\n" . _g(
+"Options:
+  --vendor <vendor>       assume <vendor> is the current vendor")
+    . "\n\n" . _g(
+"Commands:
   --is <vendor>           returns true if current vendor is <vendor>.
   --derives-from <vendor> returns true if current vendor derives from <vendor>.
   --query <field>         print the content of the vendor-specific field.