merged from debian-sid

1 files changed, 31 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 9d2ef101b..72f36cbd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,33 @@
+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
+
+ -- 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 ]
@@ -49,7 +79,7 @@ apt (0.8.9) unstable; urgency=low
 
   [ Programs translations ]
   * Slovenian update by Andrej Žnidaršič and Rosetta Slovenian team
-  ! German update by Holger Wansing. Closes: #603619
+  * German update by Holger Wansing. Closes: #603619
 
   [ David Kalnischkies ]
   * apt-pkg/aptconfiguration.cc: