From: Joey Hess Date: Sun, 9 Sep 2012 18:28:51 +0000 (-0400) Subject: Merge branch 'wheezy' X-Git-Url: https://git.donarmstrong.com/?p=debhelper.git;a=commitdiff_plain;h=073034791eea9df519a06deb4058908e30d0fa7d Merge branch 'wheezy' --- 073034791eea9df519a06deb4058908e30d0fa7d diff --cc debian/changelog index 3b34f9c,7a71156..3f85493 --- a/debian/changelog +++ b/debian/changelog @@@ -1,25 -1,14 +1,36 @@@ +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 + * Updated Spanish man page translation. Closes: #686291 + * 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 Thu, 05 Jul 2012 08:51:07 -0600 + + debhelper (9.20120909) UNRELEASED; 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 + + -- Joey Hess Sun, 09 Sep 2012 14:23:10 -0400 + debhelper (9.20120830) unstable; urgency=low * dh_installcatalogs: Adjust catalog conffile conversion to avoid