merge with debian-sid to get all the updated l10ns

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 443aedf627f14303b749684019f988d532672d9a..d09239de5814e5769cab5e3261faab3c35ff02a7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,45 @@
-apt (0.9.6) UNRELEASED; urgency=low
+apt (0.9.5.2) UNRELEASED; urgency=low
+
+  [ David Kalnischkies ]
+  * cmdline/apt-get.cc:
+    - do not show 'list of broken packages' header if no package
+      is broken as it happens e.g. for external resolver errors
+  * debian/apt-utils.links:
+    - the internal resolver 'apt' is now directly installed in
+      /usr/lib/apt/solvers, so don't instruct dh to create a broken link
+  * doc/apt-verbatim.ent:
+    - APT doesn't belong to the product 'Linux', so use 'APT' instead
+      as after all APT is a big suite of applications
+  * doc/examples/sources.list:
+    - use the codename instead of 'stable' in the examples sources.list
+      as we do in the manpage and as the debian-installer does
+  * doc/apt-get.8.xml:
+    - use apt-utils as package example instead of libc6
+
+  [ Justin B Rye ]
+  * doc/apt-cdrom.8.xml:
+    - replace CDROM with the proper CD-ROM in text
+    - correct disc vs. disk issues
+  * doc/apt-config.8.xml:
+    - review and fix spelling issues
+  * doc/apt-extracttemplates.1.xml:
+    - debconf is not DebConf
+  * doc/apt-get.8.xml:
+    - move dselect-upgrade below dist-upgrade
+    - review and fix spelling issues
+
+  [ Robert Luberda ]
+  * Polish manpage translation update (Closes: #675603)
+  * doc/apt-mark.8.xml:
+    - in hold, the option name is --file not --filename
+
+  [ Christian Perrier ]
+  * French program and manpage translation update
+  * Danish program translation by Joe Hansen. Closes: #675605
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 24 May 2012 19:40:58 +0200
+
+apt (0.9.5.1) unstable; urgency=low
 
   [ David Kalnischkies ]
   * apt-pkg/contrib/fileutl.cc:
@@ -13,8 +54,11 @@ apt (0.9.6) UNRELEASED; urgency=low
   * doc/*.xml:
     - remove 'GNU/Linux' from 'Debian systems' strings as Debian
       has more systems than just GNU/Linux nowadays
+  * doc/apt-cache.8.xml:
+    - fix a typo as well as adding missing literal markup
+    - three small rewordings for better english sentences
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 22 May 2012 18:13:19 +0200
+ -- Michael Vogt <mvo@debian.org>  Thu, 24 May 2012 17:16:34 +0200
 
 apt (0.9.5) unstable; urgency=low