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

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Apr 10 08:52:58 2008
New Revision: 2209

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2209
Log:
debian/rules, debian/dbus.postinst
- Minimize downtime of the system message bus (and dependent D-Bus
services) by restarting dbus in postinst instead of stop in prerm and
start in postinst. (Closes: #428669)

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=2209&op=diff
==============================================================================
--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Thu Apr 10 08:52:58 2008
@@ -1,8 +1,12 @@
 dbus (1.2.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
-
- -- Michael Biebl <biebl at debian.org>  Sat, 05 Apr 2008 07:28:35 +0200
+  * debian/rules, debian/dbus.postinst
+    - Minimize downtime of the system message bus (and dependent D-Bus
+      services) by restarting dbus in postinst instead of stop in prerm and
+      start in postinst. (Closes: #428669)
+
+ -- Michael Biebl <biebl at debian.org>  Thu, 10 Apr 2008 10:44:02 +0200
 
 dbus (1.1.20-1) unstable; urgency=medium
 

Modified: packages/unstable/dbus/debian/dbus.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/dbus.postinst?rev=2209&op=diff
==============================================================================
--- packages/unstable/dbus/debian/dbus.postinst (original)
+++ packages/unstable/dbus/debian/dbus.postinst Thu Apr 10 08:52:58 2008
@@ -32,5 +32,11 @@
     update-rc.d -f dbus remove >/dev/null
 fi
 
+if [ "$1" = configure ] && [ -n "$2" ] && [ -x "/etc/init.d/dbus" ]; then
+    # Restart dbus on upgrades.
+    # dh_installinit -r creates the necessary start action.
+    invoke-rc.d dbus stop || true
+fi
+
 #DEBHELPER#
 

Modified: packages/unstable/dbus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/rules?rev=2209&op=diff
==============================================================================
--- packages/unstable/dbus/debian/rules (original)
+++ packages/unstable/dbus/debian/rules Thu Apr 10 08:52:58 2008
@@ -22,7 +22,7 @@
 	--enable-doxygen-docs \
 	--disable-userdb-cache
 
-DEB_UPDATE_RCD_PARAMS += start 12 2 3 4 5 . stop  88 1 .
+DEB_DH_INSTALLINIT_ARGS := -r -- start 12 2 3 4 5 . stop  88 1 .
 
 binary-post-install/dbus-x11::
 	mkdir -p debian/dbus-x11/etc/X11/Xsession.d