Merge branch 'wheezy'

[debhelper.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index af67805744f3b146c765606b460c15348da3afea..2ff9bfa60e06fe5ae3db9d26c79310abf9880397 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,6 @@ debhelper (9.20120609) UNRELEASED; urgency=low
   * dh_shlibdeps: Warn if -V flag is passed, to avoid it accidentially being
     used here rather than in dh_makeshlibs. Closes: #680339
   * dh_lintian: Source overrides doc improvement. Closes: #683941
-  * Updated German man page translation. Closes: #685538
-  * Updated French man page translation. Closes: #685560
   * dh_installmime: No longer makes maintainer scripts run update-mime and
     update-mime-database, that is now handled by triggers. Closes: #684689
     Thanks, Charles Plessy
@@ -15,9 +13,24 @@ debhelper (9.20120609) UNRELEASED; urgency=low
     a python2.X-minimal package may provide it while not having
     distutils installed. Closes: #683557
   * dh_icons: Improve documentation. Closes: #684895
+  * Improve -X documentation. Closes: #686696
 
  -- Joey Hess <joeyh@debian.org>  Thu, 05 Jul 2012 08:51:07 -0600
 
+debhelper (9.20120909) unstable; urgency=low
+
+  * autoscript() can now be passed a perl sub to run to s/// lines of
+    the script, which avoids problems with using sed, including potentially
+    building too long a sed command-line. This will become the recommended
+    interface in the future; for now it can be used by specific commands
+    such as dh_installxmlcatalogs that encounter the problem.
+    Closes: #665296 Thanks, Marcin Owsiany
+  * Updated Spanish man page translation. Closes: #686291
+  * Updated German man page translation. Closes: #685538
+  * Updated French man page translation. Closes: #685560
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 10 Sep 2012 12:54:06 -0400
+
 debhelper (9.20120830) unstable; urgency=low
 
   * dh_installcatalogs: Adjust catalog conffile conversion to avoid