r536: * Patch from doogie to make dh_movefiles support -X. Closes: #150978

   * Pound home in dh_installman's man page that yet, it really does do the
     right thing. Closes: #150644

1 files changed, 12 insertions, 2 deletions

diff --git a/dh_movefiles b/dh_movefiles
index 97427b8d..ec13a01a 100755
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -11,7 +11,7 @@ use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
 
-B<dh_movefiles> [S<I<debhelper options>>] [B<--sourcedir=>I<dir>] [S<I<file ...>>]
+B<dh_movefiles> [S<I<debhelper options>>] [B<--sourcedir=>I<dir>] [B<-X>I<item>] S<I<file ...>>]
 
 =head1 DESCRIPTION
 
@@ -41,6 +41,11 @@ the sourcedir is moved, specifiying something like --sourcedir=/ is very
 unsafe, so to prevent mistakes, the sourcedir must be a relative filename;
 it cannot begin with a `/'.
 
+=item B<-Xitem>, B<--exclude=item>
+
+Exclude files that contain "item" anywhere in their filename from
+being installed.
+
 =item I<file ...>
 
 Lists files to move. The filenames listed should be relative to
@@ -126,7 +131,12 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 				warning("$file not found (supposed to put it in $package)");
 			}
 			$file=~s:^\Q$sourcedir\E/+::;
-			complex_doit("(cd $sourcedir >/dev/null ; find $file ! -type d -print || true) >> debian/movelist");
+			my $cmd="(cd $sourcedir >/dev/null ; find $file ! -type d ";
+			if ($dh{EXCLUDE_FIND}) {
+				$cmd.="-a ! \\( $dh{EXCLUDE_FIND} \\) ";
+			}
+			$cmd.="-print || true) >> debian/movelist";
+			complex_doit($cmd);
 		}
 		my $pwd=`pwd`;
 		chomp $pwd;