merged the relevant bits from lp:~mvo/apt/lp346386

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 1e63657bc55bcc64690b0277a25f122fc500ec61..7a8c63d04543cd6ed1f7755ad91b8a5f4fc92764 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,12 @@
-apt (0.9.7.1) UNRELEASED; urgency=low
+apt (0.9.8~exp1) UNRELEASED; urgency=low
+
+  [ David Kalnischkies ]
+  * apt-pkg/contrib/strutl.cc:
+    - support \n and \r\n line endings in ReadMessages
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 09 Jul 2012 17:36:40 +0200
+
+apt (0.9.7.1) unstable; urgency=low
 
   [ Program translation updates ]
   * Bulgarian (Damyan Ivanov) (Closes: #678983)
@@ -14,8 +22,12 @@ apt (0.9.7.1) UNRELEASED; urgency=low
   * debian/control:
     - libapt-{pkg,inst} packages should be in section 'libs' instead
       of 'admin' as by ftp-master override request in #677596
+    - demote debiandoc-sgml to Build-Depends-Indep
+  * doc/makefile:
+    - separate translation building of debiandoc from manpages
+      so that we don't need to build debiandoc for binary packages
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 25 Jun 2012 18:07:13 +0200
+ -- Michael Vogt <mvo@debian.org>  Fri, 29 Jun 2012 14:26:32 +0200
 
 apt (0.9.7) unstable; urgency=low