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

diff --git a/debian/changelog b/debian/changelog
index 8a29fb32ea78780310f5a70a7e491a70c58f1bef..b2e10d17d822ba05e6f32034783af54e11e044de 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
 debhelper (4.0.16) unstable; urgency=low
 
-UNRE
+  * 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
 
- -- Joey Hess <joeyh@debian.org>  Fri, 21 Jun 2002 16:21:06 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu,  4 Jul 2002 22:28:53 -0400
 
 debhelper (4.0.15) unstable; urgency=low
 

diff --git a/dh_movefiles b/dh_movefiles
index 97427b8d08d3604ef979492c181d8bbac57b41a5..ec13a01a9e18ad0fab4f7e4d8dcfe9000598e381 100755 (executable)
--- 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;