[Pkg-utopia-commits] r3570 - in /packages/unstable/dbus/debian: changelog dbus.init dbus.postinst

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Mar 24 00:28:21 2010
New Revision: 3570

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3570
Log:
* debian/dbus.init
  - Update LSB header: Remove runlevel 1 from Default-Stop and let killprocs
    do the job for us.
* debian/dbus.postinst
  - Remove old stop symlinks from runlevel 1 on upgrades.

Modified:
    packages/unstable/dbus/debian/changelog
    packages/unstable/dbus/debian/dbus.init
    packages/unstable/dbus/debian/dbus.postinst

Modified: packages/unstable/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/changelog?rev=3570&op=diff
==============================================================================
--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Wed Mar 24 00:28:21 2010
@@ -10,6 +10,11 @@
   * debian/control
     - Add Breaks: x11-common (<< 1:7.5+4) to dbus-x11 to ensure we have a
       recent enough version with "has_option" support.
+  * debian/dbus.init
+    - Update LSB header: Remove runlevel 1 from Default-Stop and let killprocs
+      do the job for us.
+  * debian/dbus.postinst
+    - Remove old stop symlinks from runlevel 1 on upgrades.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 23 Mar 2010 22:28:20 +0100
 

Modified: packages/unstable/dbus/debian/dbus.init
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/dbus.init?rev=3570&op=diff
==============================================================================
--- packages/unstable/dbus/debian/dbus.init (original)
+++ packages/unstable/dbus/debian/dbus.init Wed Mar 24 00:28:21 2010
@@ -4,7 +4,7 @@
 # Required-Start:    $remote_fs $syslog
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
-# Default-Stop:      1
+# Default-Stop:
 # Short-Description: D-Bus systemwide message bus
 # Description:       D-Bus is a simple interprocess messaging system, used
 #                    for sending messages between applications.

Modified: packages/unstable/dbus/debian/dbus.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/dbus.postinst?rev=3570&op=diff
==============================================================================
--- packages/unstable/dbus/debian/dbus.postinst (original)
+++ packages/unstable/dbus/debian/dbus.postinst Wed Mar 24 00:28:21 2010
@@ -31,6 +31,11 @@
     update-rc.d -f dbus remove >/dev/null
 fi
 
+# Remove stop symlinks for runlevel 1 as killprocs already does the job for us.
+if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 1.2.24-1; then
+    rm -f /etc/rc1.d/K??dbus
+fi
+
 if [ "$1" = configure ] && [ -n "$2" ] && [ -x "/etc/init.d/dbus" ]; then
     # Restart dbus on upgrades.
     # dh_installinit -r creates the necessary start action.