* merge of the debian-expermental-ma branch

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index d6bfa76eec5371834b974596977ac2b60942806d..1235a02667a9a28426ef2cdf48354232f7bef62e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,29 @@
-apt (0.7.26~exp12) UNRELEASEDexperimental; urgency=low
+apt (0.8.0~pre1) unstable; urgency=low
 
+  * merge of the debian-expermental-ma branch
+    
+
+ -- 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
-   * apt-pkg/cacheset.cc:
-     - make CacheSetHelper::canNotFindAllVer display a notice
-       only (for compat reasons). Otherwise tools like sbuild
-       blow up
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 29 Jul 2010 23:45:42 +0200
+  [ 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