From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 22 May 2012 14:52:11 +0000 (+0200)
Subject: merge from the debian-sid branch
X-Git-Tag: 0.9.13.exp1ubuntu1~70
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/d3f6489bf47dcf4fa5d8c2cd6a543ffa5f0105fe

merge from the debian-sid branch
---

d3f6489bf47dcf4fa5d8c2cd6a543ffa5f0105fe
diff --cc debian/changelog
index 6ea803fcb,e17ee702b..661610f79
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,4 +1,18 @@@
 +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) UNRELEASED; urgency=low
+ apt (0.9.5) unstable; urgency=low
  
    [ Chris Leick ]
    * proofreading of the manpage pot