Merge lp:~ubuntu-branches/ubuntu/precise/dbus/precise-201110191847 into lp:ubuntu/precise/dbus

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise/dbus reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/dbus/precise-201110191847. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

107. By Clint Byrum on 2011-10-04

d/dbus.upstart: Add clarification of network-manager workaround

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-18 18:10:19 +0000
+++ debian/changelog	2011-10-19 18:52:19 +0000
@@ -1,4 +1,14 @@
+<<<<<<< TREE
 dbus (1.4.16-1ubuntu1) precise; urgency=low
+=======
+dbus (1.4.14-1ubuntu2) UNRELEASED; urgency=low
+
+  * d/dbus.upstart: Add clarification of network-manager workaround
+
+ -- Clint Byrum <[e-mail]>  Tue, 04 Oct 2011 11:03:00 +0100
+
+dbus (1.4.14-1ubuntu1) oneiric; urgency=low
+>>>>>>> MERGE-SOURCE
 
   * Merge with Debian testing. Remaining changes:
     - Install binaries into / rather than /usr:

=== modified file 'debian/dbus.upstart'
--- debian/dbus.upstart	2011-05-23 20:56:37 +0000
+++ debian/dbus.upstart	2011-10-19 18:52:19 +0000
@@ -6,6 +6,9 @@
 description	"D-Bus system message bus"
 
 start on local-filesystems
+# Note that this event is used to prevent network-manager
+# from stopping too early. There is no known functional
+# reason that dbus should wait until this event to stop.
 stop on deconfiguring-networking
 
 expect fork