From: Joey Hess <joey@kitenet.net>
Date: Mon, 12 Sep 2011 17:40:27 +0000 (-0400)
Subject: dh_fixperms: Operate on .ali files throughout /usr/lib, including multiarch dirs... 
X-Git-Tag: 8.9.8~11
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=63157c540e451c47bd334c295cd11c576808b5f0;hp=959a75532fd0cb6eb47b13c3328a4d2d0feddce1;p=debhelper.git

dh_fixperms: Operate on .ali files throughout /usr/lib, including multiarch dirs. Closes: #641279

This is extra work, but querying dpkg-architecture for the multiarch lib
dir could easily take just as long.
---

diff --git a/debian/changelog b/debian/changelog
index 68987b7..cf0ba10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (8.9.8) UNRELEASED; urgency=low
+
+  * dh_fixperms: Operate on .ali files throughout /usr/lib, including
+    multiarch dirs. Closes: #641279
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 12 Sep 2011 13:35:52 -0400
+
 debhelper (8.9.7) unstable; urgency=low
 
   * dh: Now you can use override_dh_command-arch and override_dh_command-indep
diff --git a/dh_fixperms b/dh_fixperms
index 3730b49..d6e237b 100755
--- a/dh_fixperms
+++ b/dh_fixperms
@@ -105,11 +105,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	}
 	
 	# ADA ali files should be mode 444 to avoid recompilation
-	if (-d "$tmp/usr/lib/ada") {
-		complex_doit("find $tmp/usr/lib/ada -type f",
-			"-name '*.ali' $find_options -print0",
-			"2>/dev/null | xargs -0r chmod uga-w");
-	}
+	complex_doit("find $tmp/usr/lib -type f",
+		"-name '*.ali' $find_options -print0",
+		"2>/dev/null | xargs -0r chmod uga-w");
 
 	# Lintian overrides should never be executable, too.
 	if (-d "$tmp/usr/share/lintian") {