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

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 52adf66a07202dc497f6186b5011b329f0c8eade..db2a1cf55ca01b57d2f97d3082a491073642cc80 100644 (file)
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -354,7 +354,7 @@ 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.           
-               if (defined $globdir && compat(3)) {
+               if (defined $globdir && ! compat(2)) {
                        for (map { glob "$globdir/$_" } split) {
                                s#^$globdir/##;
                                push @ret, $_;

diff --git a/debian/changelog b/debian/changelog
index 80af3efad6fe579d8e27a380f6cc57b140df11af..0e88c5794bde3d772df068b2be878094982bb1a2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (2.2.5) unstable; urgency=low
+
+  * Oops, it was not expanding wildcard when it should.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 29 Nov 2000 20:59:33 -0800
+
 debhelper (2.2.4) unstable; urgency=low
 
   * dh_movefiles: added error message on file not found

diff --git a/dh_movefiles b/dh_movefiles
index cbfc3e6c71aa5b2ba02abd87779c38ae87f31a47..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/$_");