From: Joey Hess Date: Thu, 2 Jul 2009 16:29:31 +0000 (-0400) Subject: Merge branch 'master' into buildsystems X-Git-Tag: 7.3.1~1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9b758456f806e9813e2b7b91d7596c63b63f55ae;p=debhelper.git Merge branch 'master' into buildsystems Conflicts: debian/changelog --- 9b758456f806e9813e2b7b91d7596c63b63f55ae diff --cc debian/changelog index 737ceca,94f4057..e33f170 --- a/debian/changelog +++ b/debian/changelog @@@ -1,34 -1,10 +1,47 @@@ ++debhelper (7.3.1) experimental; urgency=low ++ ++ * Merged debhelper 7.2.20. ++ ++ -- Joey Hess Thu, 02 Jul 2009 12:28:55 -0400 ++ +debhelper (7.3.0) experimental; urgency=low + + * Modular object oriented dh_auto_* buildsystem support, + contributed by Modestas Vainius + - dh_auto_* --sourcedirectory can now be used to specify a source + directory if sources and/or the whole buildsystem lives elsewhere + than the top level directory. Closes: #530597 + - dh_auto_* --builddirectory can now be used to specify a build + directory to use for out of source building, for build systems + that support it. Closes: #480577 + - dh_auto_* --buildsystem can now be used to override the autodetected + build system, or force use of a third-party class. + - dh_auto_* --list can be used to list available and selected build + systems. + - Adds support for cmake. + - For the perl_build build system, Build is used consistently + instead of falling back to using the generated Makefile. + Closes: #534332 + - Historical dh_auto_* behavior should be preserved despite these + large changes.. + * Move two more command-specific options to only be accepted by the commands + that use them. The options are: + --sourcedir, --destdir + If any third-party debhelper commands use either of the above options, + they will be broken, and need to be changed to pass options to init(). + * Make dh not complain about unknown, command-specific options passed to it, + and further suppress warnings about such options it passes on to debhelper + commands. This was attempted incompletely before in version 7.2.17. + + -- Joey Hess Wed, 01 Jul 2009 15:31:20 -0400 + + debhelper (7.2.20) unstable; urgency=low + + * dh_install: Fix installation of entire top-level directory + from debian/tmp. Closes: #535367 + + -- Joey Hess Thu, 02 Jul 2009 12:17:42 -0400 + debhelper (7.2.19) unstable; urgency=low * dh_install: Handle correctly the case where a glob expands to