diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/dbus.postinst | 19 | ||||
| -rw-r--r-- | debian/dbus.prerm | 5 |
3 files changed, 8 insertions, 24 deletions
diff --git a/debian/changelog b/debian/changelog index 93027738..c42e5446 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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@debian.org> Sat, 14 Apr 2007 15:24:57 +0200 + dbus (1.0.2-2) unstable; urgency=low [ Sebastian Dröge ] diff --git a/debian/dbus.postinst b/debian/dbus.postinst index c4fb1ddb..7cc891a6 100644 --- a/debian/dbus.postinst +++ b/debian/dbus.postinst @@ -14,23 +14,4 @@ chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup --system "$MESSAGEUS 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# diff --git a/debian/dbus.prerm b/debian/dbus.prerm index 251b7dad..07fe0c20 100644 --- a/debian/dbus.prerm +++ b/debian/dbus.prerm @@ -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# |