scripts: Place Commands: before Options: in --help output

debian/changelog

@@ -15,6 +15,8 @@ dpkg (1.17.14) UNRELEASED; urgency=low
       of variables, and new -A and -T options to override defaulting to the
       host system.
     - Clarify that -a, -t, -e and -i work with the host system.
+  * Place 'Commands:' before 'Options:' sections on --help output in
+    dpkg-architecture and dpkg-vendor.
 
   [ Raphaël Hertzog ]
   * Explain better in deb-triggers(5) why interest/activate-noawait should be

scripts/dpkg-architecture.pl

@@ -46,13 +46,6 @@ sub usage {
     printf _g(
 'Usage: %s [<option>...] [<command>]')
     . "\n\n" . _g(
-'Options:
-  -a<debian-arch>    set host Debian architecture.
-  -t<gnu-system>     set host GNU system type.
-  -A<debian-arch>    set target Debian architecture.
-  -T<gnu-system>     set target GNU system type.
-  -f                 force flag (override variables set in environment).')
-    . "\n\n" . _g(
 'Commands:
   -l                 list variables (default).
   -L                 list valid architectures.
@@ -63,8 +56,15 @@ sub usage {
   -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.
-'), $Dpkg::PROGNAME;
+      --version      show the version.')
+    . "\n\n" . _g(
+'Options:
+  -a<debian-arch>    set host Debian architecture.
+  -t<gnu-system>     set host GNU system type.
+  -A<debian-arch>    set target Debian architecture.
+  -T<gnu-system>     set target GNU system type.
+  -f                 force flag (override variables set in environment).')
+    . "\n", $Dpkg::PROGNAME;
 }
 
 sub list_arches()

scripts/dpkg-vendor.pl

@@ -41,16 +41,16 @@ sub usage {
     printf _g(
 '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.
   --help                  show this help message.
-  --version               show the version.
-'), $Dpkg::PROGNAME;
+  --version               show the version.')
+    . "\n\n" . _g(
+'Options:
+  --vendor <vendor>       assume <vendor> is the current vendor.')
+    . "\n", $Dpkg::PROGNAME;
 }
 
 my ($vendor, $param, $action);