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

[Ryan Niebur]

The following commit has been merged in the master branch:
commit c9eab79786444aee5270c7b84e7259e458ade049
Author: Ryan Niebur <ryanryan52 at gmail.com>
Date:   Tue Jan 24 11:35:42 2012 -0800

    one last TODO, I think I know the proper solution that will work in all possible situations

diff --git a/debian/changelog b/debian/changelog
index e02126a..b2f46bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 thin (1.3.1-1) UNRELEASED; urgency=low
 
+  TODO: copy and tweak logic from dpkg-maintscript-helper,
+        to properly handle when only thin1.8 is installed
+	prior to the upgrade
+
   [ Laurent Arnoud ]
   * New upstream release
   * Switch to gem2deb-based packaging. Binary package renamed to
diff --git a/debian/thin.postinst b/debian/thin.postinst
index 229b319..b330933 100644
--- a/debian/thin.postinst
+++ b/debian/thin.postinst
@@ -1,11 +1,11 @@
 # complete dpkg-maintscript-helper operations
 
 if [ -h /etc/init.d/thin.dpkg-remove ] || [ -h /etc/init.d/thin.dpkg-backup ]; then
-   dpkg-maintscript-helper rm_conffile /etc/init.d/thin 1.2.4-1.1 thin -- "$@"
+   dpkg-maintscript-helper rm_conffile /etc/init.d/thin -- "$@"
 fi
 
 if [ -e /etc/init.d/thin1.8.dpkg-remove ] || [ -e /etc/init.d/thin1.8.dpkg-backup ]; then
-   dpkg-maintscript-helper rm_conffile /etc/init.d/thin1.8 1.2.4-1.1 thin1.8 -- "$@"
+   dpkg-maintscript-helper rm_conffile /etc/init.d/thin1.8 -- "$@"
 fi
 
 #DEBHELPER#
diff --git a/debian/thin.postrm b/debian/thin.postrm
index 229b319..b330933 100644
--- a/debian/thin.postrm
+++ b/debian/thin.postrm
@@ -1,11 +1,11 @@
 # complete dpkg-maintscript-helper operations
 
 if [ -h /etc/init.d/thin.dpkg-remove ] || [ -h /etc/init.d/thin.dpkg-backup ]; then
-   dpkg-maintscript-helper rm_conffile /etc/init.d/thin 1.2.4-1.1 thin -- "$@"
+   dpkg-maintscript-helper rm_conffile /etc/init.d/thin -- "$@"
 fi
 
 if [ -e /etc/init.d/thin1.8.dpkg-remove ] || [ -e /etc/init.d/thin1.8.dpkg-backup ]; then
-   dpkg-maintscript-helper rm_conffile /etc/init.d/thin1.8 1.2.4-1.1 thin1.8 -- "$@"
+   dpkg-maintscript-helper rm_conffile /etc/init.d/thin1.8 -- "$@"
 fi
 
 #DEBHELPER#
diff --git a/debian/thin.preinst b/debian/thin.preinst
index 747aa32..db811d0 100644
--- a/debian/thin.preinst
+++ b/debian/thin.preinst
@@ -1,12 +1,12 @@
 # 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
-  dpkg-maintscript-helper rm_conffile /etc/init.d/thin 1.2.4-1.1 thin -- "$@"
+  dpkg-maintscript-helper rm_conffile /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
-   dpkg-maintscript-helper rm_conffile /etc/init.d/thin1.8 1.2.4-1.1 thin1.8 -- "$@"
+   dpkg-maintscript-helper rm_conffile /etc/init.d/thin1.8 -- "$@"
    update-rc.d thin1.8 remove
 fi
 

-- 
ruby-thin.git