X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_fixperms;h=10261493fe85516f612e7cb8ad59cc03ce5a6b0f;hb=a7a4b118fa290eb38be206c4c01a8f433c4f8f14;hp=2a565bd3f926937b12605c83bc83f9384d9cdeda;hpb=78e828cbc2604324385a20f21083d929d0097ea9;p=debhelper.git

diff --git a/dh_fixperms b/dh_fixperms
index 2a565bd..1026149 100755
--- a/dh_fixperms
+++ b/dh_fixperms
@@ -23,10 +23,10 @@ dh_fixperms makes all files in usr/share/doc in the package build directory
 (excluding files in the examples/ directory) be mode 644. It also changes
 the permissions of all man pages to mode 644. It makes all files be owned
 by root, and it removes group and other write permission from all files. It
-removes execute permissions from any libraries that have it set. It makes
-all files in bin/ directories, /usr/games/ and etc/init.d executable (v4
-only). Finally, it removes the setuid and setgid bits from all files in the
-package.
+removes execute permissions from any libraries, headers, perl modules, or
+desktop files that have it set. It makes all files in the standard bin and
+sbin directories, usr/games/ and etc/init.d executable (since v4). Finally,
+it removes the setuid and setgid bits from all files in the package.
 
 =head1 OPTIONS
 
@@ -76,8 +76,16 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		"2>/dev/null | xargs -0r chmod 644");
 	
 	# ..and header files ..
-	complex_doit("find $tmp/usr/include  -type f",
-		"-name '*.h' $find_options -print0",
+	complex_doit("find $tmp/usr/include -type f $find_options -print0",
+		"2>/dev/null | xargs -0r chmod 644");
+	
+	# ..and desktop files ..
+	complex_doit("find $tmp/usr/share/applications -type f $find_options -print0",
+		"2>/dev/null | xargs -0r chmod 644");
+
+	# ..and OCaml native-code shared objects ..
+	complex_doit("find $tmp -perm -5 -type f",
+		"\\( -name '*.cmxs' \\) $find_options -print0",
 		"2>/dev/null | xargs -0r chmod 644");
 	
 	# .. and perl modules.
@@ -85,13 +93,13 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		"-perm -5 -name '*.pm' $find_options -print0",
 		"2>/dev/null | xargs -0r chmod a-X");
 	
-	# v4 only
+	# v4 and up
 	if (! compat(3)) {
 		# Programs in the bin and init.d dirs should be executable..
 		for my $dir (qw{usr/bin bin usr/sbin sbin usr/games etc/init.d}) {
 			if (-d "$tmp/$dir") {
 				complex_doit("find $tmp/$dir -type f $find_options -print0 2>/dev/null",
-					"| xargs -0r chmod +x");
+					"| xargs -0r chmod a+x");
 			}
 		}
 	}
@@ -102,6 +110,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