diff -Nru hostname-3.05/debian/changelog hostname-3.05ubuntu1/debian/changelog --- hostname-3.05/debian/changelog 2010-11-16 14:31:13.000000000 +0100 +++ hostname-3.05ubuntu1/debian/changelog 2010-11-17 14:42:22.000000000 +0100 @@ -1,3 +1,13 @@ +hostname (3.05ubuntu1) natty; urgency=low + + * Merge from debian unstable (LP: #676474), 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. + * Don't compare versions during the build to avoid the package FTBFS + + -- Lorenzo De Liso Wed, 17 Nov 2010 14:25:16 +0100 + hostname (3.05) unstable; urgency=low * Updated hostname.c to carry correct version number. (Closes: @@ -7,6 +17,15 @@ -- Michael Meskes Tue, 16 Nov 2010 14:31:07 +0100 +hostname (3.04ubuntu1) maverick; urgency=low + + * Merge from debian unstable (LP: #590481), 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. + + -- Lorenzo De Liso Sun, 06 Jun 2010 20:08:11 +0200 + hostname (3.04) unstable; urgency=low * Don't strip domain before resolving it for a fqdn hostname. (Closes: @@ -15,6 +34,15 @@ -- Michael Meskes Mon, 22 Mar 2010 11:58:16 +0100 +hostname (3.03ubuntu1) lucid; urgency=low + + * Merging from Debian Testing, 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. + + -- Vikram Dhillon Wed, 10 Mar 2010 19:00:50 +0000 + hostname (3.03) unstable; urgency=low * Do not use buffer on error return. (Closes: #565634) - thanks to @@ -38,6 +66,15 @@ -- Michael Meskes Fri, 15 Jan 2010 13:08:57 +0100 +hostname (3.01ubuntu1) lucid; urgency=low + + * Resynchronise with Debian. 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. + + -- Colin Watson Mon, 14 Dec 2009 15:02:30 +0000 + hostname (3.01) unstable; urgency=low * Made 'hostname -s' only display the host name cut at the first dot. @@ -62,6 +99,15 @@ -- Michael Meskes Mon, 28 Sep 2009 15:31:05 +0200 +hostname (2.98ubuntu1) lucid; urgency=low + + * Resynchronise with Debian. 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. + + -- Colin Watson Wed, 09 Dec 2009 14:34:13 +0000 + hostname (2.98) unstable; urgency=low [ Cristian Greco ] @@ -98,6 +144,20 @@ -- Daniel Baumann Thu, 27 Aug 2009 10:01:51 +0200 +hostname (2.95ubuntu1) karmic; urgency=low + + FFE LP: #427356. + + * Add -b option that allows the file specified by -F to be non-existant + or empty, in which case the default hostname of "localhost" will be set + if none is set currently. + * Install Upstart job to set hostname on startup, but do not run it in + postinst. + * debian/control: + - Bump build-dependency on debhelper for Upstart-aware dh_installinit + + -- Scott James Remnant Tue, 15 Sep 2009 03:37:22 +0100 + hostname (2.95) unstable; urgency=low * Bumping to new policy. diff -Nru hostname-3.05/debian/control hostname-3.05ubuntu1/debian/control --- hostname-3.05/debian/control 2010-11-16 14:26:44.000000000 +0100 +++ hostname-3.05ubuntu1/debian/control 2010-11-17 14:26:43.000000000 +0100 @@ -1,10 +1,11 @@ Source: hostname Section: admin Priority: required -Maintainer: Debian Hostname Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Hostname Team Uploaders: Michael Meskes Standards-Version: 3.9.1 -Build-Depends: debhelper (>= 5) +Build-Depends: debhelper (>= 7.4.20ubuntu1) Package: hostname Architecture: any diff -Nru hostname-3.05/debian/rules hostname-3.05ubuntu1/debian/rules --- hostname-3.05/debian/rules 2010-11-16 14:26:02.000000000 +0100 +++ hostname-3.05ubuntu1/debian/rules 2010-11-17 14:39:00.000000000 +0100 @@ -28,7 +28,6 @@ dh_testdir # Building package - [ "$(DEBVERSION)" = "$(PRGVERSION)" ] || exit 1 CFLAGS="$(CFLAGS)" $(MAKE) $(CROSS) touch build-stamp @@ -60,6 +59,7 @@ dh_installchangelogs dh_installdocs dh_install + dh_installinit --upstart-only --no-start dh_strip dh_compress dh_fixperms diff -Nru hostname-3.05/debian/upstart hostname-3.05ubuntu1/debian/upstart --- hostname-3.05/debian/upstart 1970-01-01 01:00:00.000000000 +0100 +++ hostname-3.05ubuntu1/debian/upstart 2010-11-17 14:27:21.000000000 +0100 @@ -0,0 +1,13 @@ +# hostname - set system hostname +# +# This task is run on startup to set the system hostname from /etc/hostname, +# falling back to "localhost" if that file is not readable or is empty and +# no hostname has yet been set. + +description "set system hostname" + +start on startup + +task +exec hostname -b -F /etc/hostname +