-
Committer:
Package Import Robot
-
Author(s):
Martin Pitt
-
Date:
2012-02-22 09:26:02 UTC
-
mfrom:
(1.1.30)
(1.3.22 sid)
-
Revision ID:
package-import@ubuntu.com-20120222092602-siuki52zdxbtcjog
Tags: 1.4.18-1ubuntu1
* Merge with Debian unstable to pick up the new bug fix release. Remaining
Ubuntu changes:
- Install binaries into / rather than /usr:
+ debian/rules: Set --exec-prefix=/
+ debian/dbus.install, debian/dbus-x11.install: Install from /bin
- Use upstart to start:
+ Add debian/dbus.upstart.
+ debian/control: Add upstart dependency.
+ debian/dbus.postinst: Use upstart call instead of invoking the init.d
script for checking if we are already running.
+ debian/control: versioned dependency on netbase that emits the new
deconfiguring-networking event used in upstart script.
- 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.
- Add 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.