merged from the debian-sid branch

diff --combined debian/changelog
index 6f611f2f576af5efe7c5bd2f9b950af63f8c5618,8f9f4b97debe0278515b698ae9de596fb395a2bb..9f4dca04e5a13443682834873a6ca1b80d14f599
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,35 -1,38 +1,62 @@@
 +apt (0.9.8~exp1) UNRELEASED; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/contrib/strutl.cc:
 +    - support \n and \r\n line endings in ReadMessages
 +
 +  [ Michael Vogt ]
 +  * lp:~mvo/apt/webserver-simulate-broken-with-fix346386:
 +    - fix invalid InRelease file download checking and add regression
 +      test to server broken files to the buildin test webserver
 +  * stop exporting the accidently exported parsenetrc() symbol
 +  * lp:~mvo/apt/add-glob-function:
 +    -  add Glob() to fileutl.{cc,h}
 +  * lp:~mvo/apt/config-clear:
 +    - support Configuration.Clear() for a clear of the entire 
 +      configuration
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - use tcgetattr() on STDOUT instead of STDIN so that term.log
 +      works for redirected stdin
 +
 + -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 09 Jul 2012 17:36:40 +0200
 +
  apt (0.9.7.8) UNRELEASED; urgency=low
  
    [ Manpages translation updates ]
    * Italian (Beatrice Torracca). Closes: #696601
    
+   [ Programs translation updates ]
+   * Japanese (Kenshi Muto). Closes: #699783
+   
    [ Michael Vogt ]
    * fix pkgProblemResolver::Scores, thanks to Paul Wise. 
      Closes: #697577
 +  * [ABI BREAK] apt-pkg/pkgcache.h:
 +    - adjust pkgCache::State::VerPriority enum, to match reality
+   * fix missing translated apt.8 manpages, thanks to Helge Kreutzmann
+     for the report. Closes: #696923
+   * apt-pkg/contrib/progress.cc:
+     - Make "..." translatable to fix inconsistencies in the output
+       of e.g. apt-get update. While this adds new translatable strings,
+       not having translations for them will not break anything.
+       Thanks to Guillem Jover. Closes: #696225
+   * debian/apt.cron.daily:
+     - when reading from /dev/urandom, use less entropy and fix a rare
+       bug when the random number chksum is less than 1000.
+       Closes: #695285
+   * methods/https.cc:
+     - reuse connection in https, thanks to Thomas Bushnell, BSG for the
+       patch. LP: #1087543, Closes: #695359
+     - add missing curl_easy_cleanup()
+   * methods/http.cc:
+     - quote spaces in filenames to ensure as the http method is also
+       (potentially) used for non deb,dsc content that may contain
+       spaces, thanks to Daniel Hartwig and Thomas Bushnell 
+       (LP: #1086997)
+     - quote plus in filenames to work around a bug in the S3 server
+       (LP: #1003633)
+   * apt-pkg/indexrecords.cc:
+     - support '\r' in the Release file
  
   -- Christian Perrier <bubulle@debian.org>  Mon, 24 Dec 2012 07:01:20 +0100