[Pkg-cyrus-sasl2-commits] r535 - in /cyrus-sasl-2.1/trunk/debian: changelog rules sasl2-bin.postinst sasl2-bin.saslauthd.init

[fabbe at users.alioth.debian.org]

Author: fabbe
Date: Mon Dec 28 10:08:36 2009
New Revision: 535

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=535
Log:
No longer explicitly run stop init script on shutdown and reboot.

Modified:
    cyrus-sasl-2.1/trunk/debian/changelog
    cyrus-sasl-2.1/trunk/debian/rules
    cyrus-sasl-2.1/trunk/debian/sasl2-bin.postinst
    cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.init

Modified: cyrus-sasl-2.1/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/changelog?rev=535&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Mon Dec 28 10:08:36 2009
@@ -7,8 +7,11 @@
   * debian/control, debian/sasl2-bin.postinst,
     debian/patches/0017_db4.8.dpatch: Bump libdb version to 4.8.
     (Closes: #556609)
-
- -- Fabian Fagerholm <fabbe at debian.org>  Mon, 28 Dec 2009 11:58:42 +0200
+  * debian/rules, debian/sasl2-bin.postinst, debian/sasl2-bin.saslauthd.init:
+    No longer explicitly run stop init script on shutdown and reboot.
+    (Closes: #560748)
+
+ -- Fabian Fagerholm <fabbe at debian.org>  Mon, 28 Dec 2009 12:08:04 +0200
 
 cyrus-sasl2 (2.1.23.dfsg1-3) unstable; urgency=low
 

Modified: cyrus-sasl-2.1/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/rules?rev=535&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/rules (original)
+++ cyrus-sasl-2.1/trunk/debian/rules Mon Dec 28 10:08:36 2009
@@ -274,7 +274,7 @@
 	cp debian/libsasl2-modules-otp.lintian-overrides \
 		debian/libsasl2-modules-otp/usr/share/lintian/overrides/libsasl2-modules-otp
 	dh_install -s --autodest --list-missing --sourcedir=$(TMPPKG)
-	dh_installinit --name=saslauthd
+	dh_installinit --name=saslauthd start 20 2 3 4 5 . stop 20 1 .
 	dh_installman -s
 	dh_link -s
 	dh_strip -s --dbg-package=cyrus-sasl2-dbg

Modified: cyrus-sasl-2.1/trunk/debian/sasl2-bin.postinst
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/sasl2-bin.postinst?rev=535&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/sasl2-bin.postinst (original)
+++ cyrus-sasl-2.1/trunk/debian/sasl2-bin.postinst Mon Dec 28 10:08:36 2009
@@ -69,6 +69,12 @@
 			dpkg-statoverride --update --add root sasl 660 $SASLDB_FILE
 		fi
 
+		# In 2.1.23.dfsg1-4 and later versions, saslauthd is no longer
+		# explicitly stopped on shutdown and reboot.
+		if dpkg --compare-versions "$2" lt "2.1.23.dfsg1-4"; then
+			rm -f /etc/rc0.d/K20saslauthd /etc/rc6.d/K20saslauthd
+		fi
+
 		db_stop
 
 		;;

Modified: cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.init
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.init?rev=535&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.init (original)
+++ cyrus-sasl-2.1/trunk/debian/sasl2-bin.saslauthd.init Mon Dec 28 10:08:36 2009
@@ -4,7 +4,7 @@
 # Required-Start:    $local_fs $remote_fs
 # Required-Stop:     $local_fs $remote_fs
 # Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
+# Default-Stop:      1
 # Short-Description: saslauthd startup script
 # Description:       This script starts the saslauthd daemon. It is
 #                    configured using the file /etc/default/saslauthd.