-
Committer:
Bazaar Package Importer
-
Author(s):
Steve Langasek, Ubuntu Merge-o-Matic
-
Date:
2011-05-16 09:02:28 UTC
-
mfrom:
(1.1.26 upstream)
(1.3.13 sid)
-
Revision ID:
james.westby@ubuntu.com-20110516090228-i8n0duqc6bzn1hsv
Tags: 1.4.8-3ubuntu1
[ Ubuntu Merge-o-Matic ]
* Merge from Debian unstable. Remaining changes:
- Build for multiarch.
- debian/dbus.postinst: Prevent dbus.postinst from failing in chroots
- Install into / rather than /usr.
- debian/dbus.postinst: Use upstart call instead of invoking the init.d
script for checking if we are already running.
- Add debian/dbus.upstart.
- 0001-activation-allow-for-more-variation-than-just-system.patch,
0002-bus-change-systemd-activation-to-activation-systemd.patch,
0003-upstart-add-upstart-as-a-possible-activation-type.patch,
0004-upstart-add-UpstartJob-to-service-desktop-files.patch,
0005-activation-implement-upstart-activation.patch: Patches from Scott
James Remnant to implement Upstart service activation. Not upstream.
- 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.
- debian/rules: fix up the .pc file to still point at /usr/lib, not/ lib.
* Dropped changes:
- dh_installinit --error-handler: we don't want to ignore all failures
from invoke-rc.d. Instead, chroot setups should set a policy-rc.d
that prevents *all* services from trying to be started on package
install.