[Hostname-devel] [SCM] Git repository for hostname branch, master, updated. debian/3.10-4-g3ef07de

[Michael Meskes]

The following commit has been merged in the master branch:
commit 3ef07de1c38d75c4a53a5a05e644a9a14b3fecf9
Author: Michael Meskes <meskes at debian.org>
Date:   Thu Feb 16 16:01:14 2012 +0100

    Do not install hostname.1.fr anymore because it is outdated.

diff --git a/Makefile b/Makefile
index 078e34a..a4855f8 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ install: hostname
 	ln -fs hostname.1 ${BASEDIR}/usr/share/man/man1/domainname.1
 	ln -fs hostname.1 ${BASEDIR}/usr/share/man/man1/ypdomainname.1
 	ln -fs hostname.1 ${BASEDIR}/usr/share/man/man1/nisdomainname.1
-	install -o root -g root -m 0644 hostname.1.fr ${BASEDIR}/usr/share/man/fr/man1/hostname.1
+	#install -o root -g root -m 0644 hostname.1.fr ${BASEDIR}/usr/share/man/fr/man1/hostname.1
 
 	install -d ${BASEDIR}/bin
 	install -o root -g root -m 0755 hostname ${BASEDIR}/bin
diff --git a/debian/changelog b/debian/changelog
index 7243bb3..1a6e092 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+hostname (3.11) unstable; urgency=low
+
+  * Fixed typo in manpage.
+    Thanks to Regid Ichira <regid23 at yahoo.com> (Closes: #659836)
+  * Order options alphabetically in program.
+    Thanks to Jari Aalto <jari.aalto at cante.net> (Closes: #660106)
+  * Combine options in manpage.
+  * Do not install hostname.1.fr anymore because it is outdated.
+
+ -- Michael Meskes <meskes at debian.org>  Thu, 16 Feb 2012 16:02:01 +0100
+
 hostname (3.10) unstable; urgency=low
 
   * Enabled hardened build flag.
diff --git a/debian/dirs b/debian/dirs
index 77fd05e..6916f5e 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,3 +1,2 @@
 /bin
 /usr/share/man/man1
-/usr/share/man/fr/man1
diff --git a/hostname.c b/hostname.c
index 36f4878..fd84a3e 100644
--- a/hostname.c
+++ b/hostname.c
@@ -45,7 +45,7 @@
 #include <err.h>
 #include <rpcsvc/ypclnt.h>
 
-#define VERSION "3.10"
+#define VERSION "3.11"
 
 enum type_t { DEFAULT, DNS, FQDN, SHORT, ALIAS, IP, NIS, NIS_DEF, ALL_FQDNS, ALL_IPS };
 

-- 
Git repository for hostname