r409: * Corrected globbing issue with dh_movefiles in v3 mode. Closes: #81431

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index db2a1cf55ca01b57d2f97d3082a491073642cc80..5373e8086f3919a30aa6bb45569275cbe3002108 100644 (file)
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -131,6 +131,7 @@ sub xargs {
 
         # The kernel can accept command lines up to 20k worth of characters.
        my $command_max=20000; # LINUX SPECIFIC!!
+                       # I could use POSIX::ARG_MAX, but that would be slow.
 
        # Figure out length of static portion of command.
        my $static_length=0;
@@ -353,12 +354,11 @@ sub filearray {
                #
                # The tricky bit is that the glob expansion is done
                # as if we were in the specified directory, so the
-               # filenames that come out are relative to it.           
+               # filenames that come out are relative to it.
                if (defined $globdir && ! compat(2)) {
                        for (map { glob "$globdir/$_" } split) {
                                s#^$globdir/##;
                                push @ret, $_;
-                               print "(--$_)\n";
                        }
                }
                else {

diff --git a/debian/changelog b/debian/changelog
index fa4953474bec3fce66cbd2b65df3c04463619ec6..4897016d7e80c2fef5cdbbe3044d171d880c54ba 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (2.2.14) unstable; urgency=medium
+
+  * Corrected globbing issue with dh_movefiles in v3 mode. Closes: #81431
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 21 Jan 2001 18:33:59 -0800
+
 debhelper (2.2.13) unstable; urgency=medium
 
   * Fixed a man page typo, Closes: #82371:

diff --git a/debian/control b/debian/control
index 07e9a4249ec833638ce6c4620b1eefe0f6f5115c..54c7afea9792651936e4cee96891965214e44ec0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Joey Hess <joeyh@debian.org>
 Build-Depends-Indep: perl-5.005, fileutils (>= 4.0-2.1), file (>= 3.23-1)
-Standards-Version: 3.2.1.0
+Standards-Version: 3.2.1.2
 
 Package: debhelper
 Architecture: all

diff --git a/dh_movefiles b/dh_movefiles
index be46dcb3827dd026e3f102187ce174047e3ac6ce..140f749afff1dc36c6eb15a10b41d533f5a0d184 100755 (executable)
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -50,6 +50,11 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
                }
                @tomove=@filelist;
        }
+       else {
+               # However, filearray() does not add the sourcedir,
+               # which we need.
+               @tomove = map { "$sourcedir/$_" } @tomove;
+       }
 
        if (@tomove) {
                if (! -d $TMP) {