r518: * dh_movefiles has long been a sore point in debhelper. Inherited

[debhelper.git] / dh_fixperms

diff --git a/dh_fixperms b/dh_fixperms
index 6b58bab793d42c95069cd07fc8bc8b52d1fb21b6..145d7361263d659c3355f2bfb24122ac8a709b04 100755 (executable)
--- a/dh_fixperms
+++ b/dh_fixperms
@@ -23,7 +23,8 @@ 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. Finally,
+It removes execute permissions from any libraries that have it set. It makes
+all files in bin/ directories and etc/init.d executable (v4 only). Finally,
 it removes the setuid and setgid bits from all files in the package.
 
 =head1 OPTIONS
@@ -58,15 +59,26 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                
        # Fix up premissions in usr/share/doc, setting everything to not
        # executable by default, but leave examples directories alone.
-       complex_doit("find $tmp/usr/share/doc $tmp/usr/doc -type f $find_options ! -regex '.*/examples/.*' -print0",
-               "2>/dev/null | xargs -0r chmod 644");
-       complex_doit("find $tmp/usr/share/doc $tmp/usr/doc -type d $find_options -print0",
-               "2>/dev/null | xargs -0r chmod 755");
+       complex_doit("find $tmp/usr/share/doc $tmp/usr/doc -type f $find_options ! -regex '.*/examples/.*' -print0 2>/dev/null",
+               "| xargs -0r chmod 644");
+       complex_doit("find $tmp/usr/share/doc $tmp/usr/doc -type d $find_options -print0 2>/dev/null",
+               "| xargs -0r chmod 755");
 
        # Executable man pages are a bad thing..
        complex_doit("find $tmp/usr/share/man $tmp/usr/man/ $tmp/usr/X11*/man/ -type f",
                "$find_options -print0 2>/dev/null | xargs -0r chmod 644");
 
+       # v4 only
+       if (! compat(3)) {
+               # Programs in the bin and init.d dirs should be executable..
+               for my $dir (qw{usr/bin bin usr/sbin sbin etc/init.d}) {
+                       if (-d "$tmp/$dir") {
+                               complex_doit("find $tmp/$dir -type f $find_options -print0 2>/dev/null",
+                                       "| xargs -0r chmod +x");
+                       }
+               }
+       }
+       
        # ..and so are executable shared and static libraries 
        # (and .la files from libtool)
        complex_doit("find $tmp -perm -5 -type f",