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

[lool at users.alioth.debian.org]

Author: lool
Date: Mon Feb 18 14:14:08 2008
New Revision: 2079

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2079
Log:
Also update symlinks to match the LSB Default-Stop changes.

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

Modified: packages/unstable/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/changelog?rev=2079&op=diff
==============================================================================
--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Mon Feb 18 14:14:08 2008
@@ -35,9 +35,10 @@
     eliminates the race condition of starting the X session before hal is
     running.  Migrate rc?.d symlinks from 20 to 12/88 on upgrades.  This need
     to be kept until after lenny is released.
-  * Set LSB Default-Stop section to 1 to only stop dbus when going down to
-    single user mode; dbus can simply be killed like everything else on
-    shutdown or reboot by sendsigs.
+  * Set LSB Default-Stop section to 1 and only install a shutdown script for
+    runlevel 1 to only stop dbus when going down to single user mode; dbus can
+    simply be killed like everything else on shutdown or reboot by sendsigs;
+    drop rc0 and rc6.d symlinks on upgrades.
   * Bump up dbus-x11 conflicts/replaces to << 1.1.2 to match the transition
     version in Ubuntu and reduce the delta.
 

Modified: packages/unstable/dbus/debian/dbus.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/dbus.postinst?rev=2079&op=diff
==============================================================================
--- packages/unstable/dbus/debian/dbus.postinst (original)
+++ packages/unstable/dbus/debian/dbus.postinst Mon Feb 18 14:14:08 2008
@@ -35,21 +35,25 @@
 
 # fix rc symlink priorities for upgrades from older versions
 if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 1.1.4-1; then
-    echo "Fixing up dbus startup script priorities..." >&2
+    echo "Fixing up dbus startup script runlevels and priorities..." >&2
+    # update start scripts to use the proper priority
     for l in 2 3 4 5; do
         old=/etc/rc$l.d/S20dbus
         new=/etc/rc$l.d/S12dbus
         if [ -e $old ] && ! [ -e $new ]; then
-            mv $old $new
+            mv -vf $old $new >&2
         fi
     done
-    for l in 0 1 6; do
-        old=/etc/rc$l.d/K20dbus
-        new=/etc/rc$l.d/K88dbus
-        if [ -e $old ] && ! [ -e $new ]; then
-            mv $old $new
+    # drop stop scripts in runlevels we don't install anymore
+    for l in 0 6; do
+        if [ -L /etc/rc$l.d/K20dbus ] && [ "../init.d/dbus"  = "$(readlink /etc/rc$l.d/K20dbus)" ]; then
+            rm -vf /etc/rc$l.d/K20dbus >&2
         fi
     done
+    # update stop script to use the proper priority
+    if [ -e /etc/rc1.d/K20dbus ] && ! [ -e /etc/rc1.d/K88dbus ]; then
+        mv -vf /etc/rc1.d/K20dbus /etc/rc1.d/K88dbus >&2
+    fi
 fi
 
 #DEBHELPER#

Modified: packages/unstable/dbus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/rules?rev=2079&op=diff
==============================================================================
--- packages/unstable/dbus/debian/rules (original)
+++ packages/unstable/dbus/debian/rules Mon Feb 18 14:14:08 2008
@@ -18,7 +18,7 @@
 	--enable-doxygen-docs \
 	--disable-userdb-cache
 
-DEB_UPDATE_RCD_PARAMS += defaults 12 88
+DEB_UPDATE_RCD_PARAMS += start 12 2 3 4 5 . stop  88 1 .
 
 binary-post-install/dbus-x11::
 	mkdir -p debian/dbus-x11/etc/X11/Xsession.d