man: Place short options before long ones

debian/changelog

@@ -117,6 +117,8 @@ dpkg (1.18.0) UNRELEASED; urgency=low
   * Document dselect -? option.
   * Capitalize dpkg-parsechangelog(1) option descriptions.
   * Mark dpkg-parsechangelog(1) --format values in bold.
+  * Place short options before long ones in dpkg-mergechangelogs(1) and
+    dselect(1) man pages.
 
   [ Raphaël Hertzog ]
   * Drop myself from Uploaders.

dselect/main.cc

@@ -187,12 +187,12 @@ usage(const struct cmdinfo *ci, const char *value)
 
   printf(_(
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --color <color-spec>       Configure screen colors.\n"
-"  --colour <color-spec>      Ditto.\n"
-"\n"), ADMINDIR);
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to <file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
+), ADMINDIR);
 
   printf(_(
 "  -?, --help                       Show this help message.\n"

man/dpkg-mergechangelogs.1

@@ -43,7 +43,7 @@ content of the entry).
 .
 .SH OPTIONS
 .TP
-.BR \-\-merge\-prereleases ", " \-m
+.BR \-m ", " \-\-merge\-prereleases
 Drop the part after the last tilde in the version number when doing
 version comparison to identify if two entries are supposed to be
 the same or not.

man/dselect.1

@@ -68,7 +68,7 @@ Changes the directory where the dpkg `\fIstatus\fP', `\fIavailable\fP' and
 similar files are located. This defaults to \fI/var/lib/dpkg\fP
 and normally there shouldn't be any need to change it.
 .TP
-.BI \-\-debug " file \fR|\fP " \-D file
+.BR \-D "\fIfile\fP, " \-\-debug " \fIfile\fP"
 Turn on debugging. Debugging information is sent to \fIfile\fP.
 .TP
 .B \-\-expert