From ccbde27ebd7562d540cf525c877ca996acc61318 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 9 May 2010 12:21:12 -0400
Subject: Further reduce the number of calls to dpkg-architecture to zero, in a
 typical package with no explicit architecture mentions in control file or
 debhelper config files.

---
 Debian/Debhelper/Dh_Lib.pm | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'Debian/Debhelper')

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 155184be..09ec0b14 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -364,9 +364,23 @@ sub pkgfile {
 		$filename="$dh{NAME}.$filename";
 	}
 	
-	my @try=("debian/$package.$filename.".buildarch(),
-		 "debian/$package.$filename.".buildos(),
-		 "debian/$package.$filename");
+	# First, check for files ending in buildarch and buildos.
+	my $match;
+	foreach my $file (glob("debian/$package.$filename.*")) {
+		next if ! -f $file;
+		next if $dh{IGNORE} && exists $dh{IGNORE}->{$file};
+		if ($file eq "debian/$package.$filename.".buildarch()) {
+			$match=$file;
+			# buildarch files are used in preference to buildos files.
+			last;
+		}
+		elsif ($file eq "debian/$package.$filename.".buildos()) {
+			$match=$file;
+		}
+	}
+	return $match if defined $match;
+
+	my @try=("debian/$package.$filename");
 	if ($package eq $dh{MAINPACKAGE}) {
 		push @try, "debian/$filename";
 	}
-- 
cgit v1.2.3