Merge branch 'wheezy'

diff --cc debian/changelog
index 489e539d998cfba2203f97db97c472909d575b99,b4d4824d60983154606657314f00a98e51a81c15..09c96a46eceffca2eefc0c87548df46504aee571
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,11 +1,31 @@@
+ debhelper (9.20120830) unstable; urgency=low
+ 
+   * dh_installcatalogs: Adjust catalog conffile conversion to avoid
+     dpkg conffile prompt when upgrading from a removed package.
+     Closes: #681194
+ 
+  -- Joey Hess <joeyh@debian.org>  Thu, 30 Aug 2012 11:04:10 -0400
+ 
 +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
 +  * 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
 +
 + -- Joey Hess <joeyh@debian.org>  Thu, 05 Jul 2012 08:51:07 -0600
 +
  debhelper (9.20120608) unstable; urgency=low
  
    * dh: When there's an -indep override target without -arch, or vice versa,