r400: * Oops, it was not expanding wildcard when it should.

[debhelper.git] / dh_movefiles

diff --git a/dh_movefiles b/dh_movefiles
index 6e3a8688195e146dd9842b39fda60c98126a0129..be46dcb3827dd026e3f102187ce174047e3ac6ce 100755 (executable)
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -43,7 +43,7 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
        # Now we need to expand wildcards in @tomove.
        # This is only necessary in pre-v3 land -- as of v3, the
        # expension is automatically done by filearray().
-       if (@tomove && ! Debian::Debhelper::Dh_Lib::compat(3)) {
+       if (@tomove && Debian::Debhelper::Dh_Lib::compat(2)) {
                @filelist=();
                foreach (@tomove) {
                        push @filelist, glob("$sourcedir/$_");
@@ -59,7 +59,10 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
                doit("rm","-f","debian/movelist");
                foreach (@tomove) {
                        $file=$_;
-                       $ret=1 if (! -e $file && ! -l $file);
+                       if (! -e $file && ! -l $file) {
+                               $ret=1;
+                               warning("$file not found");
+                       }
                        $file=~s:^\Q$sourcedir\E/+::;
                        complex_doit("(cd $sourcedir >/dev/null ; find $file ! -type d -print || true) >> debian/movelist");
                }