merged from debian-sid

diff --cc debian/changelog
index 904e920bf31090c5698e0232951f0aaca44f318c,1dc31af9fdbe95daccb489ab60c84f728818d637..1779fc774abcaaeacc0d16f046f097a8071e4fad
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,45 +1,64 @@@
 +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
 +
 + -- 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
+ 
+  -- Christian Perrier <bubulle@debian.org>  Mon, 24 Dec 2012 07:01:20 +0100
+ 
+ apt (0.9.7.7) unstable; urgency=low
+ 
+   [ Program translation updates ]
+   * Catalan (Jordi Mallach)
+   * Drop a confusing non-breaking space. Closes: #691024
+   * Thai (Theppitak Karoonboonyanan). Closes: #691613
+   * Vietnamese (Trần Ngọc Quân). Closes: #693773
+   * Fix Plural forms in German, French, Japanese and Portuguese
+     translations. Thanks to Jakub Wilk for reporting these errors.
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/packagemanager.cc:
+     - do not do lock-step configuration for a M-A:same package if it isn't
+       unpacked yet in SmartConfigure and do not unpack a M-A:same package
+       again in SmartUnPack if we have already configured it (LP: #1062503)
+   * apt-pkg/depcache.cc:
+     - don't call MarkInstall with the FromUser flag set for packages
+       which are dependencies of APT::Never-MarkAuto-Sections matchers
+     - no mode changes should obviously be ok for pkgDepCache::IsModeChangeOk
+   * cmdline/apt-get.cc:
+     - do not call Mark{Install,Delete} from the autoremove code with
+       the FromUser bit set to avoid modifying the auto-installed bit
+   * apt-pkg/algorithms.cc:
+     - ensure pkgProblemResolver calls MarkDelete without FromUser set
+       so that it can't overrule holds and the protection flag
+   
+   [ Michael Vogt ]
+   * change permissions of /var/log/apt/term.log to 0640 (LP: #975199)
+ 
+   [ Jonathan Thomas ]
+   * apt-pkg/algorithms.cc:
+     - fix package-pointer array memory leak in ResolveByKeepInternal()
+ 
+  -- Michael Vogt <mvo@debian.org>  Thu, 13 Dec 2012 09:52:19 +0100
+ 
  apt (0.9.7.6) unstable; urgency=low
  
    [ Program translation updates ]