From: Joey Hess Date: Mon, 10 Sep 2012 17:11:32 +0000 (-0400) Subject: Merge branch 'wheezy' X-Git-Url: https://git.donarmstrong.com/?p=debhelper.git;a=commitdiff_plain Merge branch 'wheezy' Conflicts: man/po4a/po/de.po --- cdb8852a4b1ef3e83f5f9fdc60285c015a38c0e1 diff --cc debian/changelog index 3f85493,bb2773a..2ff9bfa --- a/debian/changelog +++ b/debian/changelog @@@ -1,26 -1,4 +1,23 @@@ +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 + 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