refresh po/pot files in doc/ and po/

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 76107f8cb736ce9a800e7dc71df9d006d75a4420..dd2cc6e931853d513b17b813dcce614b31917da1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+apt (0.8.0~pre1) unstable; urgency=low
+
+  * merge of the debian-expermental-ma branch
+  * refresh po/pot files in doc/ and po/
+
+ -- Michael Vogt <mvo@debian.org>  Fri, 30 Jul 2010 12:42:57 +0200
+
+apt (0.7.26~exp12) experimental; urgency=low
+
+  [ Michael Vogt ]
+  * debian/control:
+    - add dependency on zlib-dev for libapt-pkg-dev
+
+  [ David Kalnischkies ]
+  * apt-pkg/cacheset.cc:
+    - [ABI BREAK] add an ErrorType option to CacheSetHelper
+  * cmdline/apt-cache.cc:
+    - use Notice instead of Error in the CacheSetHelper messages
+      for compat reasons. Otherwise tools like sbuild blow up
+    - return success in show if a virtual package was given
+  * debian/control:
+    - remove libcurl3-gnutls-dev alternative as the package is gone
+    - increase needed version of libcurl4-gnutls-dev to >= 7.19.0
+      as we use CURLOPT_{ISSUERCERT,CRLFILE} (Closes: #589642)
+
+ -- Michael Vogt <mvo@debian.org>  Fri, 30 Jul 2010 11:55:48 +0200
+
 apt (0.7.26~exp11) experimental; urgency=low
 
   [ Julian Andres Klode ]
@@ -27,8 +54,17 @@ apt (0.7.26~exp11) experimental; urgency=low
     - prefer non-virtual packages in FindPreferredPkg (Closes: #590041)
   * test/integration/*:
     - add with bug#590041 testcase a small test "framework"
+  * apt-pkg/orderlist.cc:
+    - try to install another or-group member in DepRemove before
+      breaking the or group (Closes: #590438)
+    - configure also the replacement before remove by adding Immediate flag
+  
+  [ Michael Vogt ]
+  * apt-pkg/contrib/error.{cc,h}
+    - docstring cleanup
+    - add inline DumpError() to avoid subtle API break
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 26 Jul 2010 12:40:44 +0200
+ -- Michael Vogt <mvo@debian.org>  Thu, 29 Jul 2010 16:40:58 +0200
 
 apt (0.7.26~exp10) experimental; urgency=low