merged from debian-sid

diff --cc debian/changelog
index 9d2ef101b7cb2f2086bc713964df0e89347cec92,aa0ff30d4b1bd7bb88231540c7372935e230d9c1..72f36cbd9306e908f8361a75d60ff49a591907fb
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,45 -1,29 +1,75 @@@
 -apt (0.8.11) unstable; urgency=low
++apt (0.8.10ubuntu1) natty; urgency=low
+ 
++  [ Julian Andres Klode ]
+   * cmdline/apt-cache.cc: Create an error for apt-cache depends
+     if packages could not found (LP: #647045)
++  
++  [ Michael Vogt ]
++  * merged from debian-sid
+ 
 - -- Julian Andres Klode <jak@debian.org>  Tue, 07 Dec 2010 15:47:11 +0100
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 07 Dec 2010 15:53:49 +0100
+ 
+ apt (0.8.10) unstable; urgency=low
+ 
+   [ Programs translations ]
+   * Czech by Miroslav Kure. Closes: #605107
+ 
+   [ Martin Pitt ]
+   * 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.
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/algorithms.cc:
+     - mark all installed packages first without auto installation in
+       a dist-upgrade to prefer upgrading packages instead of installing
+       new packages in versioned or-groups (Closes: #605394)
+ 
+  -- Michael Vogt <mvo@debian.org>  Tue, 30 Nov 2010 10:42:17 +0100
+ 
 +apt (0.8.9ubuntu4) natty; urgency=low
 +
 +  [ Michael Vogt ]
 +  * cmdline/apt-key:
 +    - set timeout of wget for net-update to 90 seconds (thanks to \sh)
 +
 +  [ Martin Pitt ]
 +  * Revert r1819 and r1820 to disable compressed indexes by default again.
 +    Testing has brought up a few places where this seriously degrades
 +    performance, mostly in applications which iterate through all available
 +    package records, like update-apt-xapian-index or synaptic. See
 +    https://bugs.launchpad.net/ubuntu/+bugs?field.tag=apt-compressed-indexes
 +
 + -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 25 Nov 2010 08:50:37 +0100
 +
 +apt (0.8.9ubuntu3) natty; urgency=low
 +
 +  * methods/http.cc:
 +    - do not hang if Acquire::http::ProxyAutoDetect can not be
 +      executed or returns no data (LP: #654393)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 22 Nov 2010 10:42:50 +0100
 +
 +apt (0.8.9ubuntu2) natty; urgency=low
 +
 +  * drop apt-changelog, apt-get changelog implements all the 
 +    features it provides
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 18 Nov 2010 15:22:40 +0100
 +
 +apt (0.8.9ubuntu1) natty; urgency=low
 +
 +  * re-merged from the debian-sid bzr branch
 +  * merged lp:~mvo/apt/mvo, this brings two new commands:
 +    - apt-get download binary-pkgname to download a deb
 +    - apt-get changelog binary-pkgname to display the changelog
 +  * cmdline/apt-get.cc:
 +    - if the changelog download failed, do not show the generic error
 +      but point to launchpad instead
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 18 Nov 2010 15:02:14 +0100
 +
  apt (0.8.9) unstable; urgency=low
  
    [ Christian Perrier ]

diff --cc doc/po/apt-doc.pot
Simple merge

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