[DRE-commits] [SCM] ruby-thin.git branch, master, updated. upstream/1.2.11-37-geffa95a

[Ryan Niebur]

The following commit has been merged in the master branch:
commit effa95a338d617f6aaac12340d3c58d110f6441e
Author: Ryan Niebur <ryanryan52 at gmail.com>
Date:   Tue Jan 24 10:03:25 2012 -0800

    add logic to remove rc.d files and also remove the init.d script belonging to thin1.8, so that insserv succeeds

diff --git a/debian/thin.preinst b/debian/thin.preinst
index 8a224fe..6141c6e 100644
--- a/debian/thin.preinst
+++ b/debian/thin.preinst
@@ -1,6 +1,13 @@
 # Just check if the old thin init.d conffile symlink needs to be removed
 if [ -h /etc/init.d/thin ] && [ "$(readlink /etc/init.d/thin)" = "thin1.8" ]; then
   rm -f /etc/init.d/thin
+  update-rc.d thin remove
+fi
+
+# thin1.8 provided the same service name, so we must remove it to avoid a failure due to insserv error
+if [ -f /etc/init.d/thin1.8 ]; then
+   rm_conffile /etc/init.d/thin1.8 1.2.4-1.1 thin1.8 -- "$@"
+   update-rc.d thin1.8 remove
 fi
 
 # Removed following conditions, in case prior thin package was installed and removed, but not purged (and thin1.8 was purged? this is a corner case, I admit)

-- 
ruby-thin.git