-
Committer:
Bazaar Package Importer
-
Author(s):
Martin Pitt
-
Date:
2007-05-23 11:47:58 UTC
-
Revision ID:
james.westby@ubuntu.com-20070523114758-8bjejmoghma0gc95
Tags: 1.0.2-5ubuntu1
* Merge with Debian unstable; remaining Ubuntu changes:
- debian/patches/80-dbus-change-at-console-policy.patch: Make at_console
policy work with libpam-foreground.
- debian/patches/81-session.conf-timeout.patch: Raise the service startup
timeout from 25 to 60 seconds. It may be too short on the live CD with
slow machines.
- debian/rules: Start dbus at runlevel priority 12, so that it comes
before gdm. This eliminates the race condition of starting the X session
before hal is running. Also use 'multiuser' mode of update-rc.d.
- debian/dbus.postinst: Migrate rc?.d symlinks from 20 to 12 on upgrades
to this version. This needs to be kept until the next Ubuntu LTS.
- debian/dbus.{postinst,prerm}: Reverted Debian's change to always restart
dbus on upgrades.
* debian/control: Drop dbus dependency to dbus-x11, since we crave to get
rid of that Xsession.d script. (LP: #62163)
* debian/dbus.preinst: Improve rm_conffile() to get the unmodified md5sum
from dpkg instead of hardcoding it, and remove unchanged
/etc/X11/Xsession.d/75dbus_dbus-launch on upgrade.