From: joey <joey>
Date: Thu, 30 Nov 2000 05:03:37 +0000 (+0000)
Subject: r400:    * Oops, it was not expanding wildcard when it should.
X-Git-Tag: version_2.0.101~199
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9b53dab3959087e387b73f0a573172fdc910e737;p=debhelper.git

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 52adf66..db2a1cf 100644
--- 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 80af3ef..0e88c57 100644
--- 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 cbfc3e6..be46dcb 100755
--- 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/$_");