Merge branch 'wheezy'

[debhelper.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 95c8a130be8a5102989295855a118bbabc337d59..2ff9bfa60e06fe5ae3db9d26c79310abf9880397 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,23 @@
-debhelper (9.20120909) UNRELEASED; urgency=low
+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
+  * 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
+  * python distutils buildsystem: Propigate failure of pyversions.
+    Closes: #683551 Thanks, Clint Byrum
+  * python distutils buildsystem: When checking if a version of python is
+    installed, don't trust the presense of the executable, as
+    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
@@ -8,8 +27,9 @@ debhelper (9.20120909) UNRELEASED; urgency=low
     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>  Sun, 09 Sep 2012 14:23:10 -0400
+ -- Joey Hess <joeyh@debian.org>  Mon, 10 Sep 2012 12:54:06 -0400
 
 debhelper (9.20120830) unstable; urgency=low