-
Committer:
Bazaar Package Importer
-
Author(s):
Martin Pitt
-
Date:
2007-12-03 14:02:03 UTC
-
mfrom:
(1.1.11 upstream)
-
Revision ID:
james.westby@ubuntu.com-20071203140203-qumlc82ob8vphbyv
Tags: 1.1.2-1ubuntu1
* Merge with Debian unstable. Remaining Ubuntu changes:
- devhelp integration:
o Add debian/doxygen_to_devhelp.xsl: XSLT from Fedora to generate a
devhelp documentation index. (Forwarded to FD#13495)
o debian/patches/dbus-1.0.1-generate-xml-docs.patch: Enable generation
of XML documentation (which will be turned into the devhelp index).
o debian/rules: Build and clean the devhelp index. Add xsltproc build
dependency for that.
o debian/dbus-1-doc.install: Install the devhelp index, and shuffle
files around so that devhelp finds them.
o Add debian/dbus-1-doc.links: gtk-doc symlink.
o Patch forwarded to Debian #454142.
- debian/patches/80-dbus-change-at-console-policy.patch: Make at_console
policy work with libpam-foreground. (Not forwarded upstream: this should
go away soon when dbus gets proper ConsoleKit integration.)
- 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,prerm}: Do not restart dbus on upgrades, since it
breaks too many applications. Instead, trigger a "reboot required"
notification.
- Upgrade transitions which need to be kept until after Hardy's release:
o debian/dbus.postinst: Migrate rc?.d symlinks from 20 to 12 on
upgrades.
o debian/dbus.preinst: Remove obsolete conffile
/etc/X11/Xsession.d/75dbus_dbus-launch.
o debian/control: Bump dbus-x11's Conflicts/Replaces: dbus for the
moving of dbus-launch.
* Move dbus-launch to dbus-x11 again, as in Debian. Just don't install the
Xsession.d script in debian/rules, we do not need it in Ubuntu.
* Tag our remaining patches.