* merged from debian/unstable

* merge of the debian-expermental-ma branch
* refresh po/pot files in doc/ and po/
* Fix spelling error in cmdline/apt-get.cc. Thanks to Osamu Aoki
  Closes: #594211
* Swedish (Daniel Nylander). Closes: #592366
* French (Christian Perrier)
* Thai (Theppitak Karoonboonyanan). Closes: #592695
* Russian (Yuri Kozlov). Closes: #594232
* French (Christian Perrier)
* apt-pkg/contrib/strutl.cc:
  - fix error checking for vsnprintf in its safe variant
* methods/bzip2.cc:
  - fix error checking for read in case of failing bzip2/lzma/whatever
* debian/apt.cron.daily:
  - create backups for our extended_states file (Closes: #593430)
* apt-pkg/init.cc:
  - set the default values for dir::etc::trusted options correctly
* ftparchive/writer.cc:
  - init valid-until correctly to prevent garbage entering Release file
* apt-pkg/deb/debsystem.cc:
  - set dir::state::status based at least on dir
* apt-pkg/deb/dpkgpm.cc:
  - use the InstVer instead of the CurrentVer for the autobit transfer
* methods/http.cc:
  - some http servers violate HTTP1.1 by not issuing a Reason-Phrase
    (or at least a space after the code) especially for 200, but lets
    be nice and ignore it as we don't need the reason in general
* apt-pkg/acquire-item.cc:
  - don't use ReadOnlyGzip mode for PDiffs as this mode doesn't work
    in combination with the AddFd methods of our hashclasses

diff --cc apt-pkg/deb/dpkgpm.cc
Simple merge

diff --cc debian/apt.cron.daily
Simple merge

diff --cc debian/changelog
index 6028fae17212267bf2f6c669289a0d47a4ece913,c5e57ec0e117d1b46863d73e170f451bdb992c55..cc358eaf6a0ce24e7783246c3c9e8d3727a51ac6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,51 +1,71 @@@
++apt (0.8.0ubuntu1) maverick; urgency=low
++
++  * merged from debian/unstable
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 24 Aug 2010 21:39:06 +0200
++
+ apt (0.8.0) unstable; urgency=low
+ 
+   [ Michael Vogt ]
+   * merge of the debian-expermental-ma branch
+   * refresh po/pot files in doc/ and po/
+ 
+   [ Christian Perrier ]
+   * Fix spelling error in cmdline/apt-get.cc. Thanks to Osamu Aoki
+     Closes: #594211
+ 
+   [ Programs translations ]
+   * Swedish (Daniel Nylander). Closes: #592366
+   * French (Christian Perrier)
+   * Thai (Theppitak Karoonboonyanan). Closes: #592695
+   * Russian (Yuri Kozlov). Closes: #594232
+ 
+   [ Manpages translations ]
+   * French (Christian Perrier)
+ 
+  -- Michael Vogt <mvo@debian.org>  Tue, 24 Aug 2010 16:32:19 +0200
+ 
+ apt (0.8.0~pre2) experimental; urgency=low
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/contrib/strutl.cc:
+     - fix error checking for vsnprintf in its safe variant
+   * methods/bzip2.cc:
+     - fix error checking for read in case of failing bzip2/lzma/whatever
+   * debian/apt.cron.daily:
+     - create backups for our extended_states file (Closes: #593430)
+   * apt-pkg/init.cc:
+     - set the default values for dir::etc::trusted options correctly
+   * ftparchive/writer.cc:
+     - init valid-until correctly to prevent garbage entering Release file
+   * apt-pkg/deb/debsystem.cc:
+     - set dir::state::status based at least on dir
+   * apt-pkg/deb/dpkgpm.cc:
+     - use the InstVer instead of the CurrentVer for the autobit transfer
+   * methods/http.cc:
+     - some http servers violate HTTP1.1 by not issuing a Reason-Phrase
+       (or at least a space after the code) especially for 200, but lets
+       be nice and ignore it as we don't need the reason in general
+   * apt-pkg/acquire-item.cc:
+     - don't use ReadOnlyGzip mode for PDiffs as this mode doesn't work
+       in combination with the AddFd methods of our hashclasses
+ 
+  -- Michael Vogt <mvo@debian.org>  Mon, 23 Aug 2010 19:09:08 +0200
+ 
 +apt (0.8.0~pre1ubuntu2) maverick; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - enable apport reports again (got lost in the previous merge),
 +      thanks to Matt Zimmerman
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 23 Aug 2010 13:53:09 +0200
 +
 +apt (0.8.0~pre1ubuntu1) maverick; urgency=low
 +
 +  * merged fixes from debian/experimental
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 13 Aug 2010 17:49:40 +0200
 +
  apt (0.8.0~pre1) experimental; urgency=low
  
    [ Programs translations ]