Merge lp:~ubuntu-branches/ubuntu/precise/ubuntu-defaults-builder/precise-201204030805 into lp:ubuntu/precise/ubuntu-defaults-builder

[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/ubuntu-defaults-builder reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/ubuntu-defaults-builder/precise-201204030805. 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

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-03 09:28:22 +0000
+++ debian/changelog	2012-04-03 08:09:32 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 ubuntu-defaults-builder (0.30) precise; urgency=low
 
   * bin/dh_ubuntu_defaults: Add (undocumented) --disable-restrictions option.
@@ -5,6 +6,15 @@
 
  -- Martin Pitt <[e-mail]>  Tue, 03 Apr 2012 09:28:22 +0200
 
+=======
+ubuntu-defaults-builder (0.30) UNRELEASED; urgency=low
+
+  * bin/dh_ubuntu_defaults: Add (undocumented) --disable-restrictions option.
+    (LP: #971994)
+
+ -- Martin Pitt <[e-mail]>  Tue, 03 Apr 2012 09:26:43 +0200
+
+>>>>>>> MERGE-SOURCE
 ubuntu-defaults-builder (0.29) precise; urgency=low
 
   * bin/dh_ubuntu_defaults: Fix unintentional closure binding of $tmp in