r767: This commit was manufactured by cvs2svn to create tag

[debhelper.git] / dh_fixperms

diff --git a/dh_fixperms b/dh_fixperms
index 665becc384db28bb70ac669bccb94baad606b2ae..ba4e74d643d982b30b534a0bb17069b0befc157f 100755 (executable)
--- a/dh_fixperms
+++ b/dh_fixperms
@@ -2,43 +2,36 @@
 #
 # Do some general file permission fixups.
 
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
 foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
        $TMP=tmpdir($PACKAGE);
 
-       # General permissions fixing.
        if (! defined($dh{EXCLUDE_FIND}) || $dh{EXCLUDE_FIND} eq '') {
-               # It's much faster to do it this way, but we can only do
-               # this if there is nothing to exclude.
-               if (-d $TMP) {
-                       doit("chown","-R","root.root",$TMP);
-                       doit("chmod","-R","go=rX,u+rw,a-s",$TMP);
-               }
-
                $find_options="";
        }
        else {
-               # Do it the hard way.
-               complex_doit("find $TMP ! -type l ! \\( $dh{EXCLUDE_FIND} \\) -print0",
-                       "2>/dev/null | xargs -0r chown root.root");
-               complex_doit("find $TMP ! -type l ! \\( $dh{EXCLUDE_FIND} \\) -print0",
-                       "2>/dev/null | xargs -0r chmod go=rX,u+rw,a-s");
-
                $find_options="! \\( $dh{EXCLUDE_FIND} \\)";
        }
 
+       # General permissions fixing.
+       complex_doit("find $TMP ! -type l $find_options -print0",
+               "2>/dev/null | xargs -0r chown root.root");
+       complex_doit("find $TMP ! -type l $find_options -print0",
+               "2>/dev/null | xargs -0r chmod go=rX,u+rw,a-s");
+               
+
        # Fix up premissions in usr/doc, setting everything to not exectable
        # by default, but leave examples directories alone.
-       complex_doit("find $TMP/usr/doc -type f $find_options ! -regex '.*/examples/.*' -print0",
+       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/doc -type d $find_options -print0",
+       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/man/ $TMP/usr/X11*/man/ -type f",
+       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");
 
        # ..and so are executable shared and static libraries