r35628 - in /packages/wordnet/trunk/debian: changelog dict-wn.postinst dict-wn.postrm

[tille at users.alioth.debian.org]

Author: tille
Date: Thu Apr  9 08:13:24 2009
New Revision: 35628

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35628
Log:
Fix postinst/postrm which do not need the serpento workaround any more because serpento was removed from Debian

Modified:
    packages/wordnet/trunk/debian/changelog
    packages/wordnet/trunk/debian/dict-wn.postinst
    packages/wordnet/trunk/debian/dict-wn.postrm

Modified: packages/wordnet/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/changelog?rev=35628&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/changelog (original)
+++ packages/wordnet/trunk/debian/changelog Thu Apr  9 08:13:24 2009
@@ -1,3 +1,10 @@
+wordnet (1:3.0-15) unstable; urgency=low
+
+  * Fix usage of init scripts debian/dict-wn.{postinst,prerm}
+    Closes: #522916
+
+ -- Andreas Tille <tille at debian.org>  Tue, 07 Apr 2009 22:58:07 +0200
+
 wordnet (1:3.0-14) unstable; urgency=low
 
   * Removed redundant part from description

Modified: packages/wordnet/trunk/debian/dict-wn.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/dict-wn.postinst?rev=35628&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/dict-wn.postinst (original)
+++ packages/wordnet/trunk/debian/dict-wn.postinst Thu Apr  9 08:13:24 2009
@@ -6,13 +6,17 @@
 
 case "$1" in 
      configure)
-      if [ -x /usr/sbin/dictdconfig ]; then dictdconfig -w ;fi
+	if [ -x /usr/sbin/dictdconfig ]; then dictdconfig -w ;fi
 
-      if [ -x /etc/init.d/dictd ]; then /etc/init.d/dictd restart; fi
+	# if [ -x /etc/init.d/dictd ]; then /etc/init.d/dictd restart; fi
+	if which invoke-rc.d >/dev/null 2>&1; then
+	    invoke-rc.d dictd restart
+	else
+	    /etc/init.d/dictd restart
+	fi
 
-     exit 0
-     ;;
-
+	exit 0
+    ;;
 
     failed-upgrade/abort-upgrade|abort-remove|abort-deconfigure|in-favour|removing)
         exit 0;

Modified: packages/wordnet/trunk/debian/dict-wn.postrm
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/dict-wn.postrm?rev=35628&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/dict-wn.postrm (original)
+++ packages/wordnet/trunk/debian/dict-wn.postrm Thu Apr  9 08:13:24 2009
@@ -4,12 +4,16 @@
 
 case "$1" in 
     remove|purge)
-     if [ -x /usr/sbin/dictdconfig ]; then dictdconfig -w ;fi
-     if [ -x /etc/init.d/dictd ]; then /etc/init.d/dictd restart; fi
+	if [ -x /usr/sbin/dictdconfig ]; then dictdconfig -w ;fi
 
-     exit 0
-     ;;
-
+	# if [ -x /etc/init.d/dictd ]; then /etc/init.d/dictd restart; fi
+        if which invoke-rc.d >/dev/null 2>&1; then
+	    invoke-rc.d dictd restart
+	else
+	    /etc/init.d/dictd restart
+	fi
+	exit 0
+    ;;
 
     upgrade|abort-upgrade|abort-remove|abort-deconfigure|in-favour|removing)
         exit 0;