Merge lp:~smoser/ubuntu/oneiric/hostname/merge-debian into lp:ubuntu/oneiric/hostname

[Scott Moser]

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-17 16:42:29 +0000
+++ debian/changelog	2011-05-26 04:43:23 +0000
@@ -1,3 +1,20 @@
+hostname (3.06ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable (LP: #788453), remaining changes:
+    - Install Upstart job to set hostname on startup, but do not run it in
+      postinst.
+    - Build-depend on newer debhelper for Upstart-aware dh_installinit.
+  * drop change for "Don't compare versions during the build", as debian/rules
+    uses a different mechanism for comparison that is more reasonable.
+
+ -- Scott Moser <[e-mail]>  Thu, 26 May 2011 00:37:02 -0400
+
+hostname (3.06) unstable; urgency=low
+
+  * Relax version comparison to make binnmus possible. (Closes: #616683)
+
+ -- Michael Meskes <[e-mail]>  Mon, 07 Mar 2011 12:31:08 +0100
+
 hostname (3.05ubuntu1) natty; urgency=low
 
   * Merge from debian unstable (LP: #676474), remaining changes:
 
=== modified file 'debian/rules'
--- debian/rules	2010-11-17 16:42:29 +0000
+++ debian/rules	2011-05-26 04:43:23 +0000
@@ -3,8 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEBVERSION := $(shell dpkg-parsechangelog | grep "Version:" | cut -d" " -f2)
-PRGVERSION := $(shell grep "define VERSION" hostname.c | cut -d"\"" -f2)
+DEBVERSION := $(shell dpkg-parsechangelog | awk '/Version:/ { print substr($$2,1,4)}')
+PRGVERSION := $(shell awk '/define VERSION/ { print substr($$3,2,length($$3)-2)}' hostname.c)
 
 CFLAGS = -Wall -g
 
@@ -28,6 +28,7 @@
 	dh_testdir
 
 	# Building package
+	[ "$(DEBVERSION)" = "$(PRGVERSION)" ] || exit 1
 	CFLAGS="$(CFLAGS)" $(MAKE) $(CROSS)
 
 	touch build-stamp
 
=== modified file 'hostname.c'
--- hostname.c	2010-11-17 16:42:29 +0000
+++ hostname.c	2011-05-26 04:43:23 +0000
@@ -45,7 +45,7 @@
 #include <err.h>
 #include <rpcsvc/ypclnt.h>
 
-#define VERSION "3.05"
+#define VERSION "3.06"
 
 enum type_t { DEFAULT, DNS, FQDN, SHORT, ALIAS, IP, NIS, NIS_DEF, ALL_FQDNS, ALL_IPS };