-
Committer:
Bazaar Package Importer
-
Author(s):
Martin Pitt
-
Date:
2009-12-07 17:47:06 UTC
-
mfrom:
(1.3.2 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20091207174706-ylf9r1y180xgw3bt
Tags: 1.2.16-2ubuntu1
* Merge with Debian testing; Remaining Ubuntu changes:
- Install into / rather than /usr.
- debian/control: Depend on ConsoleKit for "at_console" policy stanza.
- debian/dbus.postinst: Do not restart dbus on upgrades, since it breaks
too many applications. Instead, trigger a "reboot required" notification.
- debian/dbus.postinst: Create /var/run/dbus in postinst to handle system
being rebooted before package is configured. LP: #275229.
- Add debian/dbus.upstart and bump debhelper b-dep to ensure that it is
properly installed.
- 11_timeout_handling.patch: Fix timeout accounting. The
elapsed_milliseconds contains the time from the start, so subtracting it
on every iteration means that the timeout is much less than what is
requested. Instead compare the absolute values, but pass the difference
to calls which want a timeout so that the correct remaining time is
used. (LP #376145)
- 20_system_conf_limit.patch: Increase max_match_rules_per_connection for
the system bus to 5000 (LP #454093)
- 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.