* merged with mainline

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index fe8fbca748b5fc05b63bda2be3ff86881983a58a..3b7b2238a7b4cf20180c2f04e19da425b5af7938 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -375,8 +375,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
       },
       // Purge operation
       { 
-        {"config-files", _("Preparing for remove with config %s")},
-        {"not-installed", _("Removed with config %s")},
+        {"config-files", _("Preparing to completely remove %s")},
+        {"not-installed", _("Completely removed %s")},
         {NULL, NULL}
       },
    };

diff --git a/debian/changelog b/debian/changelog
index dccf4a99f0cb7909bd195ee58bea436a92650f5a..9a7ee7213a8462eee244d7628dce6351dfc6ede5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ apt (0.6.43.4) unstable; urgency=low
   * ftparchive/cachedb.{cc,h},writer.{cc,h}: optimizations 
     (thanks to Anthony Towns)
   * apt pdiff support from experimental merged
+  * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman)
   * Merge from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
        * bg.po: Added, complete to 512t. Closes: #360262