Merge lp:~ubuntu-branches/ubuntu/quantal/ubuntu-release-upgrader/quantal-201207161612 into lp:ubuntu/quantal/ubuntu-release-upgrader

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

8. By Brian Murray on 2012-07-13

remove control conflicts

7. By Brian Murray on 2012-07-13

Rebuild with fixed dh_python3 (LP: #1023055).

6. By Colin Watson on 2012-07-10

[ Brian Murray ]
* DistUpgrade/DistUpgradeMain.py: call clone.save_state with
  scrub_sources set so that VarLogDistUpgradeAptclonesystemstate can be
  included in bug reports again

[ Colin Watson ]
* Declare Breaks/Replaces from python3-distupgrade to old versions of
  python3-update-manager (LP: #1020229).

[ Jeremy Bicha ]
* data/release-upgrades:
  - set release upgrades default back to "normal" instead of "lts"

5. By Jonathan Riddell on 2012-07-09

Add replaces/breaks onto old update-manager-kde

4. By Michael Terry on 2012-07-06

Add *.cfg files back to the release tarball.

3. By Michael Terry on 2012-07-06

Build-Depend on python3-update-manager so its code is available when
the dist upgrade tarball is created.

2. By Michael Terry on 2012-07-06

Fix release upgrade tarball to include some UpdateManager that it
may need during upgrade. LP: #1020462