r1667: * dh_installdocs: ignore .EX files as produced by dh-make.

   * dh_movefiles: if the file cannot be found, do not go ahead and try
     to move it anyway, as this can produce unpredictable behavor with globs
     passed in from the shell. See bug #234105

2 files changed, 10 insertions, 6 deletions

diff --git a/dh_installdocs b/dh_installdocs
index f7291860..ab7e53ca 100755
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -184,6 +184,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		$regexp="(|$regexp)";
 	}
 	foreach my $fn (grep {/^${regexp}doc-base(\..*)?$/} readdir(DEB)) {
+		# .EX are example files, generated by eg, dh-make
+		next if $fn=~/\.EX$/;
 		# Parse the file to get the doc id.
 		open (IN, "debian/$fn") || die "Cannot read debian/$fn.";
 		while (<IN>) {
diff --git a/dh_movefiles b/dh_movefiles
index 7c3e70c6..acd3b20d 100755
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -130,13 +130,15 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 				$ret=1;
 				warning("$file not found (supposed to put it in $package)");
 			}
-			$file=~s:^\Q$sourcedir\E/+::;
-			my $cmd="(cd $sourcedir >/dev/null ; find $file ! -type d ";
-			if ($dh{EXCLUDE_FIND}) {
-				$cmd.="-a ! \\( $dh{EXCLUDE_FIND} \\) ";
+			else {
+				$file=~s:^\Q$sourcedir\E/+::;
+				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);
 			}
-			$cmd.="-print || true) >> debian/movelist";
-			complex_doit($cmd);
 		}
 		my $pwd=`pwd`;
 		chomp $pwd;