summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2010-03-24 00:28:21 +0000
committerMichael Biebl <biebl@debian.org>2010-03-24 00:28:21 +0000
commitb10bf38781489771124d34584689ed3d908c2b51 (patch)
tree866dc88e3cac61cc5c7eba53787b467b9d2067e2
parent9d42326dd997f2f12caf41c2c7b4b45abcc6fc91 (diff)
downloaddbus-b10bf38781489771124d34584689ed3d908c2b51.tar.gz
* debian/dbus.init
- Update LSB header: Remove runlevel 1 from Default-Stop and let killprocs do the job for us. * debian/dbus.postinst - Remove old stop symlinks from runlevel 1 on upgrades. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/dbus@3570 ceb527fc-18e6-0310-9fe2-813c157c29e7
-rw-r--r--debian/changelog5
-rw-r--r--debian/dbus.init2
-rw-r--r--debian/dbus.postinst5
3 files changed, 11 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 5e1351f8..2275c6ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,11 @@ dbus (1.2.24-1) UNRELEASED; urgency=low
* debian/control
- Add Breaks: x11-common (<< 1:7.5+4) to dbus-x11 to ensure we have a
recent enough version with "has_option" support.
+ * debian/dbus.init
+ - Update LSB header: Remove runlevel 1 from Default-Stop and let killprocs
+ do the job for us.
+ * debian/dbus.postinst
+ - Remove old stop symlinks from runlevel 1 on upgrades.
-- Michael Biebl <biebl@debian.org> Tue, 23 Mar 2010 22:28:20 +0100
diff --git a/debian/dbus.init b/debian/dbus.init
index 86be98de..6564c103 100644
--- a/debian/dbus.init
+++ b/debian/dbus.init
@@ -4,7 +4,7 @@
# Required-Start: $remote_fs $syslog
# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5
-# Default-Stop: 1
+# Default-Stop:
# Short-Description: D-Bus systemwide message bus
# Description: D-Bus is a simple interprocess messaging system, used
# for sending messages between applications.
diff --git a/debian/dbus.postinst b/debian/dbus.postinst
index 1031ed63..bdac3426 100644
--- a/debian/dbus.postinst
+++ b/debian/dbus.postinst
@@ -31,6 +31,11 @@ if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 1.1.20-1; then
update-rc.d -f dbus remove >/dev/null
fi
+# Remove stop symlinks for runlevel 1 as killprocs already does the job for us.
+if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 1.2.24-1; then
+ rm -f /etc/rc1.d/K??dbus
+fi
+
if [ "$1" = configure ] && [ -n "$2" ] && [ -x "/etc/init.d/dbus" ]; then
# Restart dbus on upgrades.
# dh_installinit -r creates the necessary start action.