merged from lp:~donkult/apt/sid

diff --combined debian/changelog
index 54e47957daa43b84a6dffe04d4455c396a7df53f,573cab419afd98593eb1df80afefc511736c382b..1d7aeba780d04aecd4f7b14fbc41ba9053133999
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,26 +1,30 @@@
  apt (0.8.5) UNRELEASED; urgency=low
  
-   
+   [ Manpages translations ]
+   * German (Chris Leick). Closes: #597163
+ 
 +  [ Michael Vogt ]
 +  * merged lp:~mvo/apt/conflicts-on-virtuals to better deal with
 +    conflicts/breaks against virtual packages (LP: #614993)
++
    [ David Kalnischkies ]
    * apt-pkg/policy.cc:
      - support 100-pinning in Release file with ButAutomaticUpgrades
        as requested by the backports crew (Closes: #596097)
    * apt-pkg/deb/deblistparser.cc:
      - overrule NotAutomatic in case of ButAutomaticUpgrades
+   * debian/apt.cron.daily:
+     - handle absolut directory paths correctly by loading directories
+       directly instead of building the paths on our own (Closes: #596421)
+   * debian/control:
+     - build-depend on docbook-xml to ensure that the xml DTDs are always
+       available on the buildds (Closes: #597145)
+   * buildlib/debiandoc.mak, buildlib/po4a_manpage.mak:
+     - ensure that the build fails if documentation building fails
+   * doc/po/fr.po:
+     - correct two syntax issues to ensure we can build fine
  
-  -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 14 Sep 2010 18:56:23 +0200
+  -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 17 Sep 2010 10:26:17 +0200
  
  apt (0.8.4) unstable; urgency=low