From: Joey Hess Date: Thu, 30 Aug 2012 16:01:41 +0000 (-0400) Subject: Merge branch 'wheezy' X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b29cdafefe70aaeee919305543466abca09bcd4b;p=debhelper.git Merge branch 'wheezy' --- b29cdafefe70aaeee919305543466abca09bcd4b diff --cc debian/changelog index 489e539,b4d4824..09c96a4 --- a/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 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 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,