From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 24 May 2012 18:55:52 +0000 (+0200)
Subject: merged from debian
X-Git-Tag: 0.9.13.exp1ubuntu1~68
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/e83b322145fe7ab2f80a610dc821757e7221a528

merged from debian
---

e83b322145fe7ab2f80a610dc821757e7221a528
diff --cc debian/changelog
index 4edc80ac3,c0cc77c29..5048dd9dd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -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: