dh: Avoid passing --with on to subcommands. Closes: #490886

2 files changed, 8 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index b01a345c..8a77d628 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (7.0.16) UNRELEASED; urgency=low
+
+  * dh: Avoid passing --with on to subcommands. Closes: #490886
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 14 Jul 2008 20:35:47 -0400
+
 debhelper (7.0.15) unstable; urgency=low
 
   * dh_clean: Do not delete *-stamp files in -k mode in v7. Closes: #489918
diff --git a/dh b/dh
index f8e26e56..289e7fc2 100755
--- a/dh
+++ b/dh
@@ -372,11 +372,11 @@ elsif ($sequence eq 'binary-indep') {
 while (@ARGV_orig) {
 	my $opt=shift @ARGV_orig;
 	next if $opt eq $sequence;
-	if ($opt =~ /^--?(after|until|before)$/) {
+	if ($opt =~ /^--?(after|until|before|with)$/) {
 		shift @ARGV_orig;
 		next;
 	}
-	elsif ($opt =~ /^--?(no-act|remaining|(after|until|before)=)/) {
+	elsif ($opt =~ /^--?(no-act|remaining|(after|until|before|with)=)/) {
 		next;
 	}
 	push @options, $opt;