reverted: --- daemontools-0.76/debian/svscan.conf +++ daemontools-0.76.orig/debian/svscan.conf @@ -1,10 +0,0 @@ -# svscan - daemontools -# -# This service starts daemontools from the point the system is -# started until it is shut down again. - -start on runlevel [123456] -stop on shutdown - -respawn -exec /usr/bin/svscanboot diff -u daemontools-0.76/debian/rules daemontools-0.76/debian/rules --- daemontools-0.76/debian/rules +++ daemontools-0.76/debian/rules @@ -66,8 +66,8 @@ # changelog test -r changelog || ln -s daemontools-0.76/src/CHANGES changelog # upstart-files - mkdir -p '$(DIR)'-run/etc/init - install -m0644 debian/svscan.conf '$(DIR)'-run/etc/init/ + mkdir -p '$(DIR)'-run/etc/event.d/ + install -m0644 debian/svscan '$(DIR)'-run/etc/event.d/ binary: binary-arch binary-indep binary-arch: install-arch daemontools.deb diff -u daemontools-0.76/debian/daemontools-run.preinst daemontools-0.76/debian/daemontools-run.preinst --- daemontools-0.76/debian/daemontools-run.preinst +++ daemontools-0.76/debian/daemontools-run.preinst @@ -6,4 +6,3 @@ echo 'Stopping svscan-service' - # ignore error (needed to recover from broken upstart job in 1:0.76-3ubuntu2) - /sbin/stop svscan || true + /sbin/stop svscan fi diff -u daemontools-0.76/debian/changelog daemontools-0.76/debian/changelog --- daemontools-0.76/debian/changelog +++ daemontools-0.76/debian/changelog @@ -1,3 +1,10 @@ +daemontools (1:0.76-3ubuntu2~hardy1~ppa2) hardy; urgency=low + + * Backport to hardy (LP: #539035) + * Revert 3ubuntu2 changes to account for older upstart version. + + -- Neil Wilson Mon, 15 Mar 2010 19:18:54 +0000 + daemontools (1:0.76-3ubuntu2) karmic; urgency=low * fix upstartification (LP: #460760) only in patch2: unchanged: --- daemontools-0.76.orig/debian/svscan +++ daemontools-0.76/debian/svscan @@ -0,0 +1,16 @@ +# svscan - daemontools +# +# This service starts daemontools from the point the system is +# started until it is shut down again. + +start on runlevel 1 +start on runlevel 2 +start on runlevel 3 +start on runlevel 4 +start on runlevel 5 +start on runlevel 6 + +stop on shutdown + +respawn +exec /usr/bin/svscanboot