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

[lool at users.alioth.debian.org]

Author: lool
Date: Mon Feb 18 11:21:13 2008
New Revision: 2075

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2075
Log:
Start dbus at runlevel priority 12.  This eliminates the race condition of
starting the X session before hal is running.  Migrate rc?.d symlinks from
20 to 12 on upgrades.  This need to be kept until after lenny is released.

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=2075&op=diff
==============================================================================
--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Mon Feb 18 11:21:13 2008
@@ -25,10 +25,15 @@
     - Bump Standards-Version to 3.7.3. No further changes required.
   * debian/dbus.init
     - Fix LSB init header. Use $remote_fs instead of $local_fs as the
-      daemon requires /usr to be mounted. 
+      daemon requires /usr to be mounted.
       Remove S from Should-Stop. (Closes: #459473)
     - Use mountpoint to check if /proc is mounted. (Closes: #458392)
     - Decrease retry-time to 5 secs on stop. (Closes: #462182)
+
+  [ Loic Minier ]
+  * Start dbus at runlevel priority 12.  This eliminates the race condition of
+    starting the X session before hal is running.  Migrate rc?.d symlinks from
+    20 to 12 on upgrades.  This need to be kept until after lenny is released.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 04 Dec 2007 21:31:12 +0100
 

Modified: packages/unstable/dbus/debian/dbus.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/dbus.postinst?rev=2075&op=diff
==============================================================================
--- packages/unstable/dbus/debian/dbus.postinst (original)
+++ packages/unstable/dbus/debian/dbus.postinst Mon Feb 18 11:21:13 2008
@@ -33,5 +33,17 @@
     ;;
 esac
 
+# 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
+    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
+        fi
+    done
+fi
+
 #DEBHELPER#
 

Modified: packages/unstable/dbus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/rules?rev=2075&op=diff
==============================================================================
--- packages/unstable/dbus/debian/rules (original)
+++ packages/unstable/dbus/debian/rules Mon Feb 18 11:21:13 2008
@@ -18,6 +18,8 @@
 	--enable-doxygen-docs \
 	--disable-userdb-cache
 
+DEB_UPDATE_RCD_PARAMS += defaults 12 20
+
 binary-post-install/dbus-x11::
 	mkdir -p debian/dbus-x11/etc/X11/Xsession.d
 	cp debian/dbus-Xsession debian/dbus-x11/etc/X11/Xsession.d/75dbus_dbus-launch