diff -u runit-2.1.1/debian/runsvdir.upstart runit-2.1.1/debian/runsvdir.upstart
--- runit-2.1.1/debian/runsvdir.upstart
+++ runit-2.1.1/debian/runsvdir.upstart
@@ -4,0 +5,4 @@
+
+post-stop script
+  find -L /etc/service/ -type d -maxdepth 1 -mindepth 1 -execdir sv -w15 force-shutdown {} +
+end script
diff -u runit-2.1.1/debian/changelog runit-2.1.1/debian/changelog
--- runit-2.1.1/debian/changelog
+++ runit-2.1.1/debian/changelog
@@ -1,3 +1,18 @@
+runit (2.1.1-4ubuntu2) maverick; urgency=low
+
+  * Kill runsvdir supervised processes in a similar manner to that suggested by
+    Daniel Néri. Ideally, runsvdir should be stopped with a HUP signal so it
+    cleans up the processes itself but that is impossible with upstart. Instead,
+    we have upstart kill the runsvdir process, then the runsv and supervised
+    processes are cleaned up by the post-stop. Fixes LP: #245728, LP: #315541 &
+    LP: #539567.
+  * Mark runsvdir.conf as conffile. Fixes Linitian error. 
+  * Remove installation of runsvdir.conf in obsolete location /etc/event.d.  
+  * Modify postinst script so that it doesn't to try to grep /etc/inittab on
+    initial package install if it doesn't exist (previous fix missed this).
+
+ -- Francis Russell <francis@unchartedbackwaters.co.uk>  Mon, 02 Aug 2010 12:54:07 +0100
+
 runit (2.1.1-4ubuntu1) maverick; urgency=low
 
   * Merge from debian unstable (LP: #602686), remaining changes:
diff -u runit-2.1.1/debian/rules runit-2.1.1/debian/rules
--- runit-2.1.1/debian/rules
+++ runit-2.1.1/debian/rules
@@ -111,8 +111,6 @@
 	rm -f changelog && ln -s runit/package/CHANGES changelog
 	# upstart file
 	install -D -m0644 debian/runsvdir.upstart \
-	  '$(DIR)'/etc/event.d/runsvdir || exit 1;
-	install -D -m0644 debian/runsvdir.upstart \
 	  '$(DIR)'/etc/init/runsvdir.conf || exit 1;
 
 binary-indep:
diff -u runit-2.1.1/debian/runit.postinst runit-2.1.1/debian/runit.postinst
--- runit-2.1.1/debian/runit.postinst
+++ runit-2.1.1/debian/runit.postinst
@@ -18,7 +18,7 @@
 
 if test -z "$2"; then
   # not upgrading
-  if grep '^SV:' /etc/inittab >/dev/null; then
+  if [ -f /etc/inittab ] && grep '^SV:' /etc/inittab >/dev/null; then
     if ! grep '^#-- runit begin' /etc/inittab >/dev/null; then
       cat <<\EOT >&2
 
diff -u runit-2.1.1/debian/runit.conffiles runit-2.1.1/debian/runit.conffiles
--- runit-2.1.1/debian/runit.conffiles
+++ runit-2.1.1/debian/runit.conffiles
@@ -2,0 +3 @@
+/etc/init/runsvdir.conf