merged from debian-sid

diff --cc apt-pkg/aptconfiguration.cc
Simple merge

diff --cc apt-pkg/depcache.cc
Simple merge

diff --cc debian/changelog
index c5ab64392201f35ece834227a5b17f8d465a21f5,479c2b939f7c93013f602684cfa6bd44c9be7d67..5731f4c80e77babe11e879c15d9efd6cd3cc4670
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,44 -1,34 +1,75 @@@
+ apt (0.8.9) UNRELEASED; urgency=low
+ 
+   [ Christian Perrier ]
+   * Fix "typos" in French manpages translations. Thanks to
+     Cyril Brulebois for bashing me.
+   * Drop useless untranslatable sections from apt.8
+ 
+   [ Programs translations ]
+   * Slovenian update by Andrej Žnidaršič and Rosetta Slovenian team
+   ! German update by Holger Wansing. Closes: #603619
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/aptconfiguration.cc:
+     - evaluate Acquire::Languages= before LANG= (Closes: #602573)
+   * apt-pkg/orderlist.cc:
+     - try fixing before removing even if the fix is hidden in
+       a provides, hidden in the #590438 testcase
+   * apt-pkg/algorithms.cc:
+     - if the package was explicitly marked as ToRemove don't
+       consider it as a candidate for FixByInstall
+   * apt-pkg/depcache.cc:
+     - don't install previously not installed providers in a try
+       to statisfy a "Breaks: provides" dependency by upgrade
+   * cmdline/acqprogress.cc:
+     - don't ask the user for media change if quiet >= 2, stdout is not
+       a tty and assume-yes, force-yes or trivial-only option is set to
+       avoid cpu eating endless loops in unattended runs like apt.cron
+       (Closes: #602354, LP: #665580)
+ 
+  -- Michael Vogt <mvo@debian.org>  Thu, 18 Nov 2010 09:25:04 +0100
+ 
 +apt (0.8.8ubuntu3) natty; urgency=low
 +
 +  * cmdline/apt-changelog: Filter out multiple results for a source package,
 +    just take the latest one.
 +  * cmdline/apt-changelog: Read server name from configuration
 +    APT::Changelog::Server instead of hardcoding it. This allows local users
 +    to point to a local changelog mirror, or make this script work for Debian.
 +  * Add debian/apt.conf.changelog: Configuration for apt-changelog with the
 +    server for Ubuntu (changelogs.ubuntu.com). Install it in debian/rules.
 +  * doc/apt-changelog.1.xml: Document the new option.
 +  * test/integration/test-compressed-indexes, test/test-indexes.sh:
 +    - Explicitly disable compressed indexes at the start. This ensures that we
 +      will actually test uncompressed indexes regardless of the internal
 +      default value of Acquire::GzipIndexes.
 +  * apt-pkg/acquire-item.cc: Set Acquire::GzipIndexes to "true" by default, to
 +    store compressed indexes. This feature is now mature enough for general
 +    consumption. Update doc/apt.conf.5.xml accordingly.
 +  * apt-pkg/aptconfiguration.cc: Have Acquire::CompressionTypes::Order default
 +    to preferring "gz", so that compressed indexes will actually work.
 +
 + -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 15 Nov 2010 12:14:15 +0100
 +
 +apt (0.8.8ubuntu2) natty; urgency=low
 +
 +  * Add cmdline/apt-changelog: Script to fetch package changelog from
 +    changelogs.ubuntu.com. Install it in cmdline/makefile and debian/rules.
 +  * Add doc/apt-changelog.1.xml, and install it in debian/rules.
 +
 + -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 09 Nov 2010 11:32:27 +0100
 +
 +apt (0.8.8ubuntu1) natty; urgency=low
 +
 +  * merged from debian-unstable, remainging changes:
 +    - use ubuntu keyring and ubuntu archive keyring in apt-key
 +    - run update-apt-xapian-index in apt.cron
 +    - support apt-key net-update and verify keys against master-keyring
 +    - run apt-key net-update in cron.daily
 +    - different example sources.list
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 29 Oct 2010 10:07:09 -0400
 +
  apt (0.8.8) unstable; urgency=low
  
    [ David Kalnischkies ]

diff --cc doc/po/fr.po
Simple merge