Created by James Westby and last modified
Get this branch:
bzr branch lp:ubuntu/lucid/dbus
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Ubuntu branches
Review team:
Ubuntu Development Team

Recent revisions

87. By Martin Pitt

releasing version 1.2.16-2ubuntu4

86. By Martin Pitt

Add debian/dbus.links: provide a symlink for dbus-daemon-launch-helper's
old location in /usr, to provide a more stable upgrade from Hardy. This
can be dropped in Lucid+1. (LP: #551672)

85. By Martin Pitt

debian/dbus-Xsession: Use new "has_option" function from x11-common
instead of grepping the option file, to avoid calling an external program.

84. By Martin Pitt

Fix installation of dbus-arch-deps.h.

83. By Martin Pitt

* 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.

82. By Michael Vogt

* 20_system_conf_limit.patch:
  - increase max_match_rules_per_connection for the system
    bus to 5000 (LP: #454093)

81. By James Westby

* Add debian/patches/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)
    Thanks to Chris Coulson for his help in tracking this down.

80. By Scott James Remnant (Canonical)

Instruct upstart to attempt to reconnect to D-Bus once we've started
the daemon.

79. By Steve Langasek

Use --exec-prefix='', not --exec-prefix=/, so that we get libdir=/lib
instead of libdir=//libavoiding the incorrect setting of rpath in the
dbus helper utils. LP: #432718.

78. By Colin Watson

82_link-order.patch: If libdbus-convenience needs symbols from any
system library (e.g. clock_gettime from -lrt on ia64) then the system
libraries need to go after libdbus-convenience.la on the link line.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.