merge from the debian-sid branch

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index cd4573468c405627a27a7dacc4cdac005083f6a8..53dfcce12e4f012a8e02ee688cfb6c156df8f921 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.7.25) UNRELEASED; urgency=low
+apt (0.7.25) unstable; urgency=low
 
   [ Christian Perrier ]
   * Fix apt-ftparchive(1) wrt description of the "-o" option.
@@ -36,6 +36,8 @@ apt (0.7.25) UNRELEASED; urgency=low
     - add "purge" to list of known actions
   * apt-pkg/init.h:
     - add compatibility with old ABI name until the next ABI break
+  * merge segfault fix from Mario Sanchez Prada, many thanks
+    (closes: #561109)
 
   [ Brian Murray ]
   * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc:
@@ -137,7 +139,7 @@ apt (0.7.25) UNRELEASED; urgency=low
   * debian/apt.conf.autoremove:
     - Add kfreebsd-image-* to the list (Closes: #558803)
 
- -- Michael Vogt <mvo@debian.org>  Thu, 10 Dec 2009 22:02:38 +0100
+ -- Michael Vogt <mvo@debian.org>  Tue, 15 Dec 2009 09:21:55 +0100
 
 apt (0.7.24) unstable; urgency=low