refresh po/pot files in doc/ and po/

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 14cc1c35244a5cbf29750f52e86de10719272b7b..dd2cc6e931853d513b17b813dcce614b31917da1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-apt (0.7.26~exp12) UNRELEASEDexperimental; urgency=low
+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:
@@ -10,12 +17,13 @@ apt (0.7.26~exp12) UNRELEASEDexperimental; urgency=low
   * 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)
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 30 Jul 2010 10:08:42 +0200
+ -- Michael Vogt <mvo@debian.org>  Fri, 30 Jul 2010 11:55:48 +0200
 
 apt (0.7.26~exp11) experimental; urgency=low