diff -Nru hostname-3.15ubuntu1/debian/changelog hostname-3.15ubuntu2/debian/changelog --- hostname-3.15ubuntu1/debian/changelog 2013-12-13 13:21:27.000000000 +0000 +++ hostname-3.15ubuntu2/debian/changelog 2014-05-21 15:00:49.000000000 +0000 @@ -1,3 +1,10 @@ +hostname (3.15ubuntu2) utopic; urgency=medium + + * Provide compatibility hostname.sh upstart job, for startpar + integration with insserv. + + -- Dimitri John Ledkov Wed, 21 May 2014 16:00:49 +0100 + hostname (3.15ubuntu1) trusty; urgency=low * Merge from Debian unstable. Remaining changes: diff -Nru hostname-3.15ubuntu1/debian/hostname.hostname.sh.upstart hostname-3.15ubuntu2/debian/hostname.hostname.sh.upstart --- hostname-3.15ubuntu1/debian/hostname.hostname.sh.upstart 1970-01-01 00:00:00.000000000 +0000 +++ hostname-3.15ubuntu2/debian/hostname.hostname.sh.upstart 2014-05-21 14:59:34.000000000 +0000 @@ -0,0 +1,9 @@ +# hostname.sh - compatibility job for sysvinit dependencies +# +# This job runs once hostname job finished running, to signal startpar +# that other rcS jobs relying on the historic hostname.sh interface +# can continue. + +description "Signal sysvinit that hostname is set" + +start on stopped hostname diff -Nru hostname-3.15ubuntu1/debian/hostname.hostname.upstart hostname-3.15ubuntu2/debian/hostname.hostname.upstart --- hostname-3.15ubuntu1/debian/hostname.hostname.upstart 1970-01-01 00:00:00.000000000 +0000 +++ hostname-3.15ubuntu2/debian/hostname.hostname.upstart 2013-07-23 09:25:08.000000000 +0000 @@ -0,0 +1,12 @@ +# +# 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 + diff -Nru hostname-3.15ubuntu1/debian/rules hostname-3.15ubuntu2/debian/rules --- hostname-3.15ubuntu1/debian/rules 2013-11-03 21:40:12.000000000 +0000 +++ hostname-3.15ubuntu2/debian/rules 2014-05-21 14:59:47.000000000 +0000 @@ -59,7 +59,8 @@ dh_installchangelogs dh_installdocs dh_install - dh_installinit --upstart-only --no-start + dh_installinit --upstart-only --no-start --name hostname + dh_installinit --upstart-only --no-start --name hostname.sh dh_strip dh_compress dh_fixperms diff -Nru hostname-3.15ubuntu1/debian/upstart hostname-3.15ubuntu2/debian/upstart --- hostname-3.15ubuntu1/debian/upstart 2013-07-23 09:25:08.000000000 +0000 +++ hostname-3.15ubuntu2/debian/upstart 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -# -# 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 -