Merge lp:~ubuntu-branches/ubuntu/precise/pam/precise-201110241932 into lp:ubuntu/precise/pam

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

83. By Steve Langasek on 2011-10-09

No-change rebuild to regenerate compressed manpages, which for some
unknown reason were compressed differently on some architectures than
on others, breaking multiarch co-installability. LP: #871083.

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-18 09:33:47 +0000
+++ debian/changelog	2011-10-24 19:42:24 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 pam (1.1.3-2ubuntu2.1) oneiric-security; urgency=low
 
   * SECURITY UPDATE: possible code execution via incorrect environment file
@@ -17,6 +18,16 @@
 
  -- Marc Deslauriers <[e-mail]>  Tue, 18 Oct 2011 09:33:47 -0400
 
+=======
+pam (1.1.3-2ubuntu2) oneiric-proposed; urgency=low
+
+  * No-change rebuild to regenerate compressed manpages, which for some
+    unknown reason were compressed differently on some architectures than
+    on others, breaking multiarch co-installability.  LP: #871083.
+
+ -- Steve Langasek <[e-mail]>  Sun, 09 Oct 2011 15:41:41 -0700
+
+>>>>>>> MERGE-SOURCE
 pam (1.1.3-2ubuntu1) oneiric; urgency=low
 
   * Merge with Debian to get bug fix for unknown kernel rlimits. Remaining