lp:~blueyed/ubuntu/oneiric/apt/fix-apt-key-man-ubuntu-references

Branch merges

Propose for merging

Merged into lp:ubuntu/oneiric/apt

Martin Pitt: Approve on 2011-10-26

Jamie Strandboge: Needs Fixing on 2011-09-14

Diff: 43 lines (+11/-5)

2 files modified

debian/changelog (+6/-0)
doc/apt-key.8.xml (+5/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #445903: apt-key: Manpage mentions Debian instead of Ubuntu keys

Low

Fix Released

Link a bug report

Related blueprints

163. By Daniel Hahler <daniel@lenny> on 2011-09-11

doc/apt-key.8.xml: Ubuntu specific documentation changes (LP: #445903)

162. By Michael Vogt on 2011-08-17

[ Michael Vogt
* merged lp:~jr/ubuntu/oneiric/apt/bzr-get-rename, thanks to
  Jonathan Riddell

[ David Kalnischkies ]
* lots of cppcheck fixes
* apt-pkg/packagemanager.cc, apt-pkg/pkgcache.cc:
  - ignore "self"-conflicts for all architectures of a package
    instead of just for the architecture of the package locked at
    in the ordering of installations too (Closes: #802901)

161. By Michael Vogt on 2011-08-11

* debian/control:
  - fix VCS location
* methods/mirror.cc:
  - include the architecture(s) in the query string as well so
    that the server can make better decisions

160. By Adam Conrad on 2011-08-09

Merge change from Robert Collins to upgrade ubuntu-keyring recommends
to a hard dependency to match Debian behaviour and fix LP: #816606

159. By Michael Vogt on 2011-08-09

* apt-pkg/acquire.cc:
  - fix potential divide-by-zero (LP: #823277)

158. By Michael Vogt on 2011-08-09

* test/integration/test-hashsum-verification:
  - add regression test for hashsum verification
* apt-pkg/acquire-item.cc:
  - if no Release.gpg file is found, still load the hashes for
    verification (closes: #636314) and add test
* apt-pkg/pkgcachegen.cc:
  - fix incorrect comparision when checking sources.list freshness

157. By Michael Vogt on 2011-08-08

merged new version from debian/experimental, this includes
a ABI break and two new library packages

156. By Adam Conrad on 2011-08-03

Merge change from Robert Collins to upgrade ubuntu-keyring recommends
to a hard dependency to match Debian behaviour and fix LP: #816606

155. By Michael Vogt on 2011-08-01

* apt-pkg/pkgcachegen.{cc,h}:
  - fix crash when P.Arch() was used but the cache got remapped
    (LP: #812862)

154. By Michael Vogt on 2011-07-29

* apt-pkg/contrib/fileutl.{cc,h}:
  - add GetModificationTime() helper
* apt-pkg/pkgcachegen.cc:
  - regenerate the cache if the sources.list changes to ensure
    that changes in the ordering there will be honored by apt
* apt-pkg/sourcelist.{cc,h}:
  - add pkgSourceList::GetLastModifiedTime() helper
* apt-pkg/pkgcachegen.{cc,h}:
  - use ref-to-ptr semantic in NewDepends() to ensure that the
    libapt does not segfault if the cache is remapped in between
    (LP: #812862)