[Pkg-mailman-hackers] Pkg-mailman commit - rev 547 - trunk/debian

[Thijs Kinkhorst]

Author: thijs
Date: 2008-07-03 14:33:26 +0000 (Thu, 03 Jul 2008)
New Revision: 547

Modified:
   trunk/debian/changelog
   trunk/debian/mailman.init
   trunk/debian/postinst
   trunk/debian/rules
Log:
No longer run the stop scripts in runlevel 0 and 6, and remove those
symlinks if upgrading from an older installation. The stop script
does nothing more than send a sigterm to the qrunner, and it is
documented that a sigterm is all the qrunners need to be stopped
safely. We can therefore leave this sending of sigterm to the general
sigterm sent by init, and save us some time by not running our own
script to do it.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-07-03 14:08:32 UTC (rev 546)
+++ trunk/debian/changelog	2008-07-03 14:33:26 UTC (rev 547)
@@ -14,6 +14,8 @@
     and refresh all patches (Closes: #485253).
   * Checked for policy 3.8.0, no changes necessary.
   * Fix a number of buglets in 99_js_templates.patch.
+  * Don't install stop symlinks in runlevels 0 and 6; the default
+    sigterm functions very well to stop qrunner.
 
  -- Thijs Kinkhorst <thijs at debian.org>  Sat, 28 Jun 2008 23:21:55 +0200
 

Modified: trunk/debian/mailman.init
===================================================================
--- trunk/debian/mailman.init	2008-07-03 14:08:32 UTC (rev 546)
+++ trunk/debian/mailman.init	2008-07-03 14:33:26 UTC (rev 547)
@@ -12,7 +12,7 @@
 # Should-Start:      
 # Should-Stop:       
 # Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
+# Default-Stop:      1
 # Short-Description: Mailman Master Queue Runner 
 # Description:       Starts and stops the Mailman queue runners, used to
 #                    manage the various message queues within the Mailman

Modified: trunk/debian/postinst
===================================================================
--- trunk/debian/postinst	2008-07-03 14:08:32 UTC (rev 546)
+++ trunk/debian/postinst	2008-07-03 14:33:26 UTC (rev 547)
@@ -163,6 +163,13 @@
             mv -f ${mm_etc}/mm_cfg.py.$$ ${mm_etc}/mm_cfg.py
         fi
     fi
+
+    # Remove obsolete stop symlinks from runlevel 0 and 6.
+    # this code can be removed after lenny.
+    if dpkg --compare-versions "$2" lt "1:2.1.11-1"; then
+        rm -f /etc/rc0.d/K20mailman /etc/rc6.d/K20mailman
+    fi
+
 fi
 
 db_stop || true

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-07-03 14:08:32 UTC (rev 546)
+++ trunk/debian/rules	2008-07-03 14:33:26 UTC (rev 547)
@@ -117,7 +117,7 @@
 		do dh_link usr/lib/$(package)/bin/$$bin usr/sbin/$$bin; done
 	mv debian/mailman/usr/sbin/arch debian/mailman/usr/sbin/mmarch
 	dh_installman
-	dh_installinit
+	dh_installinit -- start 20 2 3 4 5 . stop 20 1 .
 	dh_installdebconf
 	dh_installexamples templates/* debian/mm_cfg.py \
 		debian/mailman/usr/lib/$(package)/Mailman/Defaults.py