lp://qastaging/ubuntu/oneiric/dbus
- Get this branch:
- bzr branch lp://qastaging/ubuntu/oneiric/dbus
Branch merges
Related bugs
Related blueprints
Branch information
- Owner:
- Ubuntu branches
- Status:
- Mature
Recent revisions
- 106. By Martin Pitt
-
* Merge with Debian unstable. Remaining 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. - 105. By Sebastien Bacher
-
debian/
dbus-Xession: revert debian's commit which changed the way the
environment is updated for dbus-launch commands, the issue it fixes is
rather marginal but it creates issues commands run using gio, which is
the case of i.e indicators or unity "run a command" (lp: #807614, #809900) - 104. By Martin Pitt
-
* Merge with Debian unstable. Remaining 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. - 103. By Clint Byrum
-
Dueling uploaders.. take that Martin Pitt. Reverting versioned
dependency now that netbase 4.45ubuntu3 has in fact been uploaded. - 102. By Martin Pitt
-
debian/control: Fix versioned dependency to netbase to make package
installable again. - 100. By Clint Byrum
-
* debian/
dbus.upstart: stop on deconfiguring- networking, a new
event emitted during shutdown just before networking is deconfigured.
This is a somewhat obtuse solution to the problem of network-manager
stopping too early. (LP: #211631)
* debian/control: versioned dependency on netbase that emits the new
deconfiguring-networking event. - 99. By Steve Langasek
-
[ 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. - 98. By Steve Langasek
-
debian/rules: fix up the sed of the .pc file, we need the path to be
relative to the multiarch dir. Thanks to Lionel Le Folgoc for pointing
this out.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/ubuntu/precise/dbus