Merge lp://staging/~ubuntu-branches/ubuntu/lucid/apt/lucid-updates-201108311616 into lp://staging/ubuntu/lucid-updates/apt
| Status: | Rejected |
|---|---|
| Rejected by: | Colin Watson |
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/lucid/apt/lucid-updates-201108311616 |
| Merge into: | lp://staging/ubuntu/lucid-updates/apt |
| Diff against target: | 0 lines |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/lucid/apt/lucid-updates-201108311616 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Colin Watson (community) | Disapprove | ||
|
Review via email:
|
|||
Description of the change
The package importer has detected a possible inconsistency between the package history in the archve and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/lucid-updates/apt reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/apt/lucid-updates-201108311616. 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:/
(this is an automatically generated message)
Unmerged revisions
- 112. By Michael Vogt
-
backport support for xz compression (LP: #805389)
- 111. By Michael Vogt
-
[ Michael Vogt ]
* debian/apt.cron. daily:
- source /etc/default/locale (if available) so that the
apt-get update cron job fetches the right translated package
descriptions (LP: #652951)[ Loïc Minier ]
* Backport r2014.1.2 (see below); fixes bug in APT when running the
linaro-image-tools testsuite; LP: #709895. [ David Kalnischkies ]
* apt-pkg/acquire- item.cc:
- use also unsigned Release files again (Closes: #596189)[ Colin Watson ]
* Backport r1327.24.434, 1327.24.437, 1327.76.1 (LP: #787500) - 110. By Michael Vogt
-
backported the apt-ftparchive --arch support (LP: #714970)
- 109. By Michael Vogt
-
* ftparchive/
writer. cc:
- port changes from maverick to remove size limit for
Files,Checksum- Sha1,Checksum- Sha256 - 108. By Michael Vogt
-
* ftparchive/
writer. cc:
- write out {Files,Checksum- Sha1,Checksum- Sha256} only if
available LP: #633967. Thanks to Colin Watson - 107. By Michael Vogt
-
* apt-pkg/
deb/dpkgpm. cc:
- Fix segmentation fault when /var/log/apt ist missing. LP: #535509 - 106. By Michael Vogt
-
* debian/
apt.postinst:
- do not fail if getent returns nothing useful (LP: #579647)
thanks to Jean-Baptiste Lallement - 105. By Michael Vogt
-
[ Loïc Minier ]
* Use https:// in Vcs-Bzr URL.[ Michael Vogt ]
* apt-pkg/deb/debrecords. cc:
- fix max tag buffer size (LP: #545336, closes: #578959)
* apt-pkg/indexfile. cc:
- If no "_" is found in the language code, try to find a "."
This is required for languages like Esperanto that have no
county associated with them (LP: #560956)
Thanks to "Aisano" for the fix
Doesn't add any significant extra content or history; rejecting.