From: Joey Hess <joey@kitenet.net>
Date: Tue, 21 Apr 2009 21:22:45 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper
X-Git-Tag: 7.4.4~103
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a38f0290ad8510ac34fab77a755e21e2a40cc144;hp=34a9d126cc9119ac3df4d8c79e09453f7ef98dd2;p=debhelper.git

Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper
---

diff --git a/debian/changelog b/debian/changelog
index 12bfc24..e275d4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (7.2.9) UNRELEASED; urgency=low
+
+  * dh_fixperms: Ensure lintian overrides are mode 644.
+    (Patch from #459548)
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 21 Apr 2009 17:01:41 -0400
+
 debhelper (7.2.8) unstable; urgency=low
 
   * dh_desktop: Now a deprecated no-op, since desktop-file-utils
diff --git a/dh_fixperms b/dh_fixperms
index d9c726c..1d4a33f 100755
--- a/dh_fixperms
+++ b/dh_fixperms
@@ -105,6 +105,13 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			"-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") {
+		complex_doit("find $tmp/usr/share/lintian/overrides",
+			"-type f $find_options -print0",
+			"2>/dev/null | xargs -0r chmod 644");
+	}
 }
 
 =head1 SEE ALSO