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

diff --git a/dh_installdocs b/dh_installdocs
index f729186058e948c76a2a7134a78214db5a7203e1..ab7e53caa0b3b710316787ab4999350532d0932d 100755 (executable)
--- 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 7c3e70c612556a77274a559abd4c76f10fa7f460..acd3b20d596c742d4852b7bd75887ebe46c36425 100755 (executable)
--- 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;