Merge branch 'master' into buildsystems

Conflicts:
	Debian/Debhelper/Dh_Getopt.pm
	debian/changelog

diff --cc Debian/Debhelper/Dh_Getopt.pm
index bddc06b8102bd3aaf63e43cb7f0dee9e581c3451,864b168ea74dd5a5b48c8fb9afe2e926edf0f938..2a5aa6c26fa308861979070fef2ccdd77acee668
--- 1/Debian/Debhelper/Dh_Getopt.pm
--- 2/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 4fe56307caef24f868be41794bafbb7eb727c536,c735e9d235b506d43d0aa95c3ccbf9316b75c337..3916f1cefe67f673c792273b61579f6e8d411572
--- 1/debian/changelog
--- 2/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 <joeyh@debian.org>  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 <joeyh@debian.org>  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