Merge lp://qastaging/~ubuntu-branches/ubuntu/lucid/apt/lucid-updates-201009161715 into lp://qastaging/ubuntu/lucid-updates/apt
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~ubuntu-branches/ubuntu/lucid/apt/lucid-updates-201009161715 |
| Merge into: | lp://qastaging/ubuntu/lucid-updates/apt |
| Diff against target: | 0 lines |
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-branches/ubuntu/lucid/apt/lucid-updates-201009161715 |
| Related bugs: |
Description of the change
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid-updates/apt now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/apt/lucid-updates-201009161715. A merge should be performed if necessary.
Unmerged revisions
- 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
