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

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 68987b7e673c7c98793cf631e312f9d3ff6ea028..cf0ba10b3767adfff694d049a6a8235b81f65fdb 100644 (file)
--- 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 3730b49dae81d0882a898e660ce9f840a63bd851..d6e237bc93a270501fa95ac5770cdcb0d403b286 100755 (executable)
--- 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") {