merge segfault fix from Mario Sanchez Prada, many thanks

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index d60bdb51f1ad7644f125ac53e8e2312d9b0cd056..c2a253484d7fa48340c10bc05b4ba590cade459c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -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:
@@ -113,6 +115,11 @@ apt (0.7.25) UNRELEASED; urgency=low
     - correct various errors, typos and oddities (Closes: #552535)
   * doc/apt-secure.8.xml:
     - replace literal with emphasis tags in Archive configuration
+  * doc/apt-ftparchive.1.xml:
+    - remove informalexample tag which hides the programlisting
+  * doc/apt-get.8.xml:
+    - change equivalent "for" to "to the" (purge command)
+    - clarify --fix-broken sentence about specifying packages
 
   [ Eugene V. Lyubimkin ]
   * apt-pkg/contib/strutl.h