From: Joey Hess Date: Fri, 12 Jun 2009 04:29:04 +0000 (-0400) Subject: Merge branch 'master' into buildsystems X-Git-Tag: 7.3.0~52 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e71d6861d8a40562512b934a70ebde0bb1b2518b;p=debhelper.git Merge branch 'master' into buildsystems Conflicts: Debian/Debhelper/Dh_Getopt.pm debian/changelog --- e71d6861d8a40562512b934a70ebde0bb1b2518b diff --cc Debian/Debhelper/Dh_Getopt.pm index bddc06b,864b168..2a5aa6c --- a/Debian/Debhelper/Dh_Getopt.pm +++ b/Debian/Debhelper/Dh_Getopt.pm @@@ -172,12 -152,15 +172,12 @@@ sub parseopts # DH_INTERNAL_OPTIONS is used to pass additional options from # dh through an override target to a command. if (defined $ENV{DH_INTERNAL_OPTIONS}) { - $ENV{DH_INTERNAL_OPTIONS}=~s/^\s+//; - $ENV{DH_INTERNAL_OPTIONS}=~s/\s+$//; - @ARGV_extra=split(/\s+/,$ENV{DH_INTERNAL_OPTIONS}); - + @ARGV_extra=split_options_string($ENV{DH_INTERNAL_OPTIONS}); - my $ret=getoptions(\@ARGV_extra, $options); - if (!$ret) { - warning("warning: unknown options will be a fatal error in a future debhelper release"); - #error("unknown option; aborting"); - } + # Unknown options will be silently ignored. + my $oldwarn=$SIG{__WARN__}; + $SIG{__WARN__}=sub {}; + getoptions(\@ARGV_extra, $options); + $SIG{__WARN__}=$oldwarn; # Avoid forcing acting on packages specified in # DH_INTERNAL_OPTIONS. This way, -p can be specified diff --cc debian/changelog index 4fe5630,c735e9d..3916f1c --- a/debian/changelog +++ b/debian/changelog @@@ -1,23 -1,11 +1,31 @@@ +debhelper (7.3.0) UNRELEASED; 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 in other + but 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. + - Historical dh_auto_* behavior should be preserved despite these + large changes.. + + -- Joey Hess Mon, 20 Apr 2009 16:26:08 -0400 + + debhelper (7.2.17) UNRELEASED; urgency=low + + * Allow command-specific options to be passed to commands + via dh without causing other commands to emit a getopt + warning or deprecation message. + + -- Joey Hess Fri, 12 Jun 2009 00:26:11 -0400 + debhelper (7.2.16) unstable; urgency=low * dh_gconf: Add missed half of postrm fragment removal. Closes: #531035