From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 24 May 2012 14:01:15 +0000 (+0200)
Subject: merged from debian-sid
X-Git-Tag: 0.9.13.exp1ubuntu1~69
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/d9e10d0fdf812ebced54f4ea827d6132e0ebfef5

merged from debian-sid
---

d9e10d0fdf812ebced54f4ea827d6132e0ebfef5
diff --cc debian/changelog
index 661610f79,443aedf62..4edc80ac3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,21 +1,35 @@@
+ apt (0.9.6) UNRELEASED; urgency=low
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/contrib/fileutl.cc:
+     - dup() given compressed fd in OpenDescriptor if AutoClose
+       is disabled as otherwise gzclose() and co will close it
+   * doc/*.xml:
+     - mark even more stuff as untranslateable and improve the
+       markup here and there (no real text change)
+     - use docbook DTD 4.5 instead of 4.2 to have valid docs
+ 
+   [ Justin B Rye ]
+   * doc/*.xml:
+     - remove 'GNU/Linux' from 'Debian systems' strings as Debian
+       has more systems than just GNU/Linux nowadays
+ 
+  -- 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
 +
  apt (0.9.5) unstable; urgency=low
  
    [ Chris Leick ]