merged from debian-sid

diff --cc debian/changelog
index 661610f790a0a802bbea5a362333a30ad00af256,443aedf627f14303b749684019f988d532672d9a..4edc80ac316fcc4ec83b34d5c6dfc97f7e3ac5ac
--- 1/debian/changelog
--- 2/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 ]

diff --cc doc/apt-key.8.xml
Simple merge

diff --cc doc/po/apt-doc.pot
Simple merge

diff --cc doc/po/de.po
Simple merge

diff --cc doc/po/es.po
Simple merge

diff --cc doc/po/fr.po
Simple merge

diff --cc doc/po/it.po
Simple merge

diff --cc doc/po/ja.po
Simple merge

diff --cc doc/po/pl.po
Simple merge

diff --cc doc/po/pt.po
Simple merge

diff --cc doc/po/pt_BR.po
Simple merge