diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-05-24 20:55:52 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-05-24 20:55:52 +0200 |
| commit | e83b322145fe7ab2f80a610dc821757e7221a528 (patch) | |
| tree | 45bbd42658dd5595b0f0d23a1b321b4d4d94a7cd /debian | |
| parent | d9e10d0fdf812ebced54f4ea827d6132e0ebfef5 (diff) | |
| parent | d16fe09a2748a9b34b1be4e39ad196d5949c4ae3 (diff) | |
merged from debian
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog index 4edc80ac3..5048dd9dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,18 @@ -apt (0.9.6) UNRELEASED; urgency=low +apt (0.9.5ubuntu1) UNRELEASED; urgency=low + + * merged from debian, remaining changes: + - use ubuntu keyring and ubuntu archive keyring in apt-key + - run update-apt-xapian-index in apt.cron + - support apt-key net-update and verify keys against master-keyring + - run apt-key net-update in cron.daily + - different example sources.list + - APT::pkgPackageManager::MaxLoopCount set to 5000 + - apport pkgfailure handling + - patch for apt cross-building, see http://bugs.debian.org/666772 + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 22 May 2012 15:57:26 +0200 + +apt (0.9.5.1) unstable; urgency=low [ David Kalnischkies ] * apt-pkg/contrib/fileutl.cc: @@ -13,22 +27,11 @@ apt (0.9.6) UNRELEASED; urgency=low * doc/*.xml: - remove 'GNU/Linux' from 'Debian systems' strings as Debian has more systems than just GNU/Linux nowadays + * doc/apt-cache.8.xml: + - fix a typo as well as adding missing literal markup + - three small rewordings for better english sentences - -- David Kalnischkies <kalnischkies@gmail.com> Tue, 22 May 2012 18:13:19 +0200 - -apt (0.9.5ubuntu1) UNRELEASED; urgency=low - - * merged from debian, remaining changes: - - use ubuntu keyring and ubuntu archive keyring in apt-key - - run update-apt-xapian-index in apt.cron - - support apt-key net-update and verify keys against master-keyring - - run apt-key net-update in cron.daily - - different example sources.list - - APT::pkgPackageManager::MaxLoopCount set to 5000 - - apport pkgfailure handling - - patch for apt cross-building, see http://bugs.debian.org/666772 - - -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 22 May 2012 15:57:26 +0200 + -- Michael Vogt <mvo@debian.org> Thu, 24 May 2012 17:16:34 +0200 apt (0.9.5) unstable; urgency=low |