diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/dbus.postinst | 12 | ||||
| -rwxr-xr-x | debian/rules | 2 |
3 files changed, 20 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 77071ba4..68d5fe31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,11 +25,16 @@ dbus (1.1.4-1) UNRELEASED; urgency=low - 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@debian.org> Tue, 04 Dec 2007 21:31:12 +0100 dbus (1.1.2-1) unstable; urgency=low diff --git a/debian/dbus.postinst b/debian/dbus.postinst index 81e79a3d..3f93dee9 100644 --- a/debian/dbus.postinst +++ b/debian/dbus.postinst @@ -33,5 +33,17 @@ case "$1" in ;; 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# diff --git a/debian/rules b/debian/rules index 00a084e6..5bafeb8c 100755 --- a/debian/rules +++ b/debian/rules @@ -18,6 +18,8 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --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 |