[Pkg-utopia-commits] r1400 - packages/unstable/dbus/debian

[Sjoerd Simons]

Author: sjoerd
Date: 2007-04-14 13:25:42 +0000 (Sat, 14 Apr 2007)
New Revision: 1400

Modified:
   packages/unstable/dbus/debian/changelog
   packages/unstable/dbus/debian/dbus.postinst
   packages/unstable/dbus/debian/dbus.prerm
Log:
* debian/dbus.post{inst,rm}
  + Restart dbus on upgrades again. Might break some applications, but they
    should be fixed.

Modified: packages/unstable/dbus/debian/changelog
===================================================================
--- packages/unstable/dbus/debian/changelog	2007-04-14 11:38:08 UTC (rev 1399)
+++ packages/unstable/dbus/debian/changelog	2007-04-14 13:25:42 UTC (rev 1400)
@@ -1,3 +1,11 @@
+dbus (1.0.2-3) UNRELEASED; urgency=low
+
+  * debian/dbus.post{inst,rm}
+    + Restart dbus on upgrades again. Might break some applications, but they
+      should be fixed.
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 14 Apr 2007 15:24:57 +0200
+
 dbus (1.0.2-2) unstable; urgency=low
 
   [ Sebastian Dröge ]

Modified: packages/unstable/dbus/debian/dbus.postinst
===================================================================
--- packages/unstable/dbus/debian/dbus.postinst	2007-04-14 11:38:08 UTC (rev 1399)
+++ packages/unstable/dbus/debian/dbus.postinst	2007-04-14 13:25:42 UTC (rev 1400)
@@ -14,23 +14,4 @@
 chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || \
 	adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
 
-# Do not restart dbus on upgrades, only on fresh installations
-# But do reload it so the machine-id can be generated
-if [ "$1" = "configure" ]; then
-    if [ -e /var/run/dbus/pid ] && 
-      ps --no-heading -p $(cat /var/run/dbus/pid) > /dev/null; then
-        # trigger an update notification which recommends to reboot
-        [ -x /usr/share/update-notifier/notify-reboot-required ] && \
-            /usr/share/update-notifier/notify-reboot-required || true
-        if [ -x "/etc/init.d/dbus" ]; then
-          if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-                invoke-rc.d dbus reload || true
-          else
-                /etc/init.d/dbus reload || true
-          fi
-        fi
-        exit 0
-    fi
-fi
-
 #DEBHELPER#

Modified: packages/unstable/dbus/debian/dbus.prerm
===================================================================
--- packages/unstable/dbus/debian/dbus.prerm	2007-04-14 11:38:08 UTC (rev 1399)
+++ packages/unstable/dbus/debian/dbus.prerm	2007-04-14 13:25:42 UTC (rev 1400)
@@ -1,8 +1,3 @@
 #!/bin/sh -e
 
-# Do not restart dbus on upgrades, only stop if we remove the package
-if [ "$1" = "upgrade" ]; then
-    exit 0
-fi
-
 #DEBHELPER#