merged from the debian-sid branch

2 files changed, 57 insertions, 7 deletions

diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove
index b3f4a3edd..ebe49c7cd 100644
--- a/debian/apt.conf.autoremove
+++ b/debian/apt.conf.autoremove
@@ -8,6 +8,7 @@ APT
 	"^kfreebsd-image.*";
 	"^linux-restricted-modules.*";
 	"^linux-ubuntu-modules-.*";
+	"^gnumach$";
   };
 
   Never-MarkAuto-Sections
diff --git a/debian/changelog b/debian/changelog
index a354c9f8c..21a5cc6d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
-apt (0.8.10) unstable; urgency=low
+apt (0.8.11) unstable; urgency=low
 
   [ Michael Vogt ]
   * methods/http.cc:
     - do not hang if Acquire::http::ProxyAutoDetect can not be
       executed or returns no data (LP: #654393)
+  * debian/apt.conf.autoremove:
+    - never autoremove the GNU/Hurd kernel (closes: #588423), thanks
+      to Guillem Jover
+  * apt-pkg/cdrom.cc, apt-pkg/init.cc, methods/cdrom.cc:
+    - use /media/cdrom as default mountoint (closes: #611569)
 
   [ Martin Pitt ]
   * test/integration/test-compressed-indexes, test/test-indexes.sh:
@@ -11,15 +16,61 @@ apt (0.8.10) unstable; urgency=low
       will actually test uncompressed indexes regardless of the internal
       default value of Acquire::GzipIndexes.
 
+ -- Michael Vogt <mvo@debian.org>  Tue, 01 Feb 2011 09:38:48 +0100
+
+apt (0.8.10.3) unstable; urgency=low
+
+  [ Programs translations ]
+  * po/es.po: Updated, plus fixes encoding issues and fixes two fuzzy
+    strings, thanks to Javier Fernandez-Sanguino (closes: #610692)
+
+ -- Michael Vogt <mvo@debian.org>  Tue, 25 Jan 2011 11:51:42 +0100
+
+apt (0.8.10.2) unstable; urgency=low
+
   [ David Kalnischkies ]
   * ftparchive/apt-ftparchive.cc:
     - fix endless loop for multiple TranslationsWriters
 
+ -- Michael Vogt <mvo@debian.org>  Tue, 25 Jan 2011 10:26:15 +0100
+
+apt (0.8.10.1) unstable; urgency=low
+
+  [ Christian Perrier ]
+  * Fix encoding for Slovenian translation. PO file switched
+    to UTF-8. Closes: #609957
+
+  [ Julian Andres Klode ]
+  * cmdline/apt-cache.cc: Create an error for apt-cache depends
+    if packages could not found (LP: #647045)
+
   [ Programs translations ]
-  * po/es.po: Updated, plus fixes encoding issues and fixes two fuzzy
-    strings, thanks to Javier Fernandez-Sanguino (closes: #610692)
+  * Spanish update by Javier Fernández-Sanguino Peña. Closes: #607145 
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 22 Nov 2010 10:40:45 +0100
+  [ Manpages translations ]
+  * Correct a typo and an error in French manpages translation.
+    Closes: # 607170
+
+ -- Michael Vogt <mvo@debian.org>  Mon, 17 Jan 2011 13:41:04 +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.9) unstable; urgency=low
 
@@ -30,7 +81,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:
@@ -88,8 +139,6 @@ apt (0.8.7) unstable; urgency=low
   * apt-pkg/deb/debsystem.cc:
     - fix issues with dir::state::status and dir::state::extended_states
       when alternative rootdirs are used
-  * apt-pkg/contrib/weakptr.h:
-    - fix compile error with g++ 4.6
 
   [ Martin Pitt ]
   * apt-pkg/deb/debindexfile.cc: