[Hostname-devel] [SCM] Git repository for hostname branch, master, updated. debian/3.08-1-gb965c33

[Michael Meskes]

The following commit has been merged in the master branch:
commit b965c332b5fe05240f10e056c8dd49f8133396f5
Author: Michael Meskes <meskes at debian.org>
Date:   Wed Dec 28 15:13:59 2011 +0100

    Order items alphabetically in manpage
    
    Closes: #653269
    
    Thanks: Jari Aalto <jari.aalto at cante.net>

diff --git a/debian/changelog b/debian/changelog
index 9da5635..be2c5c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hostname (3.09) unstable; urgency=low
+
+  * Order items alphabetically in manpage.
+    Thanks to Jari Aalto <jari.aalto at cante.net> (Closes: #653269)
+
+ -- Michael Meskes <meskes at debian.org>  Wed, 28 Dec 2011 15:14:48 +0100
+
 hostname (3.08) unstable; urgency=low
 
   * Prevent a potential buffer underrun.
diff --git a/hostname.1 b/hostname.1
index 025cf0c..c80dbd3 100644
--- a/hostname.1
+++ b/hostname.1
@@ -166,6 +166,15 @@ is subject to the same limitations so it should be avoided as well.
 Display the alias name of the host (if used). This option is deprecated
 and should not be used anymore.
 .TP
+.I "\-A, \-\-all-fqdns"
+Displays all FQDNs of the machine. This option enumerates all configured
+network addresses on all configured network interfaces, and translates
+them to DNS domain names. Addresses that cannot be translated (i.e. because
+they do not have an appropriate reverse DNS entry) are skipped. Note that
+different addresses may resolve to the same name, therefore the output may
+contain duplicate entries. Do not make any assumptions about the order of the
+output.
+.TP
 .I "\-b, \-\-boot"
 Always set a hostname; this allows the file specified by \fI-F\fR to be
 non-existant or empty, in which case the default hostname \fIlocalhost\fR
@@ -181,10 +190,6 @@ instead. Ssee the warnings in section
 .B "THE FQDN"
 above, and avoid using this option.
 .TP
-.I "\-F, \-\-file filename"
-Read the host name from the specified file. Comments (lines starting with
-a `#') are ignored.
-.TP
 .I "\-f, \-\-fqdn, \-\-long"
 Display the FQDN (Fully Qualified Domain Name). A FQDN consists of a
 short host name and the DNS domain name. Unless you are using bind or NIS
@@ -195,17 +200,9 @@ above, and avoid using this option; use
 .BR "hostname \-\-all-fqdns"
 instead.
 .TP
-.I "\-A, \-\-all-fqdns"
-Displays all FQDNs of the machine. This option enumerates all configured
-network addresses on all configured network interfaces, and translates
-them to DNS domain names. Addresses that cannot be translated (i.e. because
-they do not have an appropriate reverse DNS entry) are skipped. Note that
-different addresses may resolve to the same name, therefore the output may
-contain duplicate entries. Do not make any assumptions about the order of the
-output.
-.TP
-.I "\-h, \-\-help"
-Print a usage message and exit.
+.I "\-F, \-\-file filename"
+Read the host name from the specified file. Comments (lines starting with
+a `#') are ignored.
 .TP
 .I "\-i, \-\-ip-address"
 Display the network address(es) of the host name. Note that this works only
@@ -223,16 +220,19 @@ order of the output.
 .I "\-s, \-\-short"
 Display the short host name. This is the host name cut at the first dot.
 .TP
-.I "\-V, \-\-version"
-Print version information on standard output and exit successfully.
-.TP
 .I "\-v, \-\-verbose"
 Be verbose and tell what's going on.
 .TP
+.I "\-V, \-\-version"
+Print version information on standard output and exit successfully.
+.TP
 .I "\-y, \-\-yp, \-\-nis"
 Display the NIS domain name. If a parameter is given (or
 .B \-\-file name
 ) then root can also set a new NIS domain.
+.TP
+.I "\-h, \-\-help"
+Print a usage message and exit.
 .SH NOTES
 The address families
 .B hostname
diff --git a/hostname.c b/hostname.c
index aa1e7aa..79cb4e7 100644
--- a/hostname.c
+++ b/hostname.c
@@ -45,7 +45,7 @@
 #include <err.h>
 #include <rpcsvc/ypclnt.h>
 
-#define VERSION "3.08"
+#define VERSION "3.09"
 
 enum type_t { DEFAULT, DNS, FQDN, SHORT, ALIAS, IP, NIS, NIS_DEF, ALL_FQDNS, ALL_IPS };
 

-- 
Git repository for hostname