merged -r1901..1911 from lp:~donkult/apt/sid

diff --combined debian/changelog
index 269d3c4dbadd7cf78ad28c66672084dd8393c5b1,4718015a3514707c11d8253174b577a77c5561a5..5830b8ad55bd88ca66af7969d2343fe66363fbb6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -15,36 -15,6 +15,36 @@@ apt (0.7.25) UNRELEASED; urgency=lo
      Closes: #551534
    * German translation of manpages by Chris Leick
      Closes: #552606
 +  * Italian translation update by Milo Casagrande
 +    Closes: #555797
 +  * Simplified Chinese translation update by Aron Xu 
 +    Closes: #558737
 +  * Slovak translation update by Ivan Masár
 +    Closes: #559277
 +  
 +  [ Michael Vogt ]
 +  * apt-pkg/packagemanager.cc:
 +    - add output about pre-depends configuring when debug::pkgPackageManager
 +      is used
 +  * methods/https.cc:
 +    - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972
 +      thanks to Brian Thomason for the patch
 +  * merge lp:~mvo/apt/netrc branch, this adds support for a
 +    /etc/apt/auth.conf that can be used to store username/passwords
 +    in a "netrc" style file (with the extension that it supports "/"
 +    in a machine definition). Based on the maemo git branch (Closes: #518473)
 +    (thanks also to Jussi Hakala and Julian Andres Klode)
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - add "purge" to list of known actions
 +
 +  [ Brian Murray ]
 +  * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc:
 +    - typo fix (LP: #462328)
 +  
 +  [ Loïc Minier ]
 +  * cmdline/apt-key:
 +    - Emit a warning if removed keys keyring is missing and skip associated
 +      checks (LP: #218971)
  
    [ David Kalnischkies ]
    * apt-pkg/packagemanager.cc:
@@@ -68,6 -38,16 +68,16 @@@
    * buildlib/configure.mak, buildlib/config.{sub,guess}:
      - remove (outdated) config.{sub,guess} and use the ones provided
        by the new added build-dependency autotools-dev instead
+   * configure.in, buildlib/{xml,yodl,sgml}_manpage.mak:
+     - remove the now obsolete manpage buildsystems
+   * doc/{pl,pt_BR,es,it}/*.{sgml,xml}:
+     - convert all remaining translation to the po4a system
+   * debian/control:
+     - drop build-dependency on docbook-utils and xmlto
+     - add build-dependency on autotools-dev
+     - bump policy to 3.8.3 as we have no outdated manpages anymore
+   * debian/NEWS:
+     - fix a typo in 0.7.24: Allready -> Already (Closes: #557674)
  
    [ Chris Leick ]
    * doc/ various manpages:
@@@ -88,10 -68,9 +98,10 @@@
      - Restrict option names to alphanumerical characters and "/-:._+".
      - Deprecate #include, we have apt.conf.d nowadays which should be
        sufficient.
 -  * methods/https.cc:
 -    - Add support for authentication using netrc (Closes: #518473), patch
 -      by Jussi Hakala <jussi.hakala@hut.fi>.
 +  * ftparchive/apt-ftparchive.cc:
 +    - Call setlocale() so translations are actually used.
 +  * debian/apt.conf.autoremove:
 +    - Add kfreebsd-image-* to the list (Closes: #558803)
  
   -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 29 Sep 2009 15:51:34 +0200