r266: * FHS complience. Patch from Johnie Ingram <johnie@netgod.net>.

     For the most part, this was a straight-forward substitution,
     dh_installmanpages needed a non-obvious change though.
   * Closes: #42489, #42587, #41732.
   * dh_installdocs: Adds code to postinst and prerm as specified in
     http://www.debian.org/Lists-Archives/debian-ctte-9908/msg00038.html,
     to make /usr/doc/<package> a compatability symlink to
     /usr/share/doc/<package>. Note that currently if something exists in
     /usr/doc/<package> when the postinst is run, it will silently not make
     the symlink. I'm considering more intellingent handing of this case.
   * Note that if you build a package with this version of debhelper, it will
     use /usr/share/man, /usr/share/doc, and /usr/share/info. You may need to
     modify other files in your package that reference the old locations.

1 files changed, 36 insertions, 23 deletions

diff --git a/dh_fixperms b/dh_fixperms
index a2fd9442..0ad5c605 100755
--- a/dh_fixperms
+++ b/dh_fixperms
@@ -1,29 +1,42 @@
-#!/bin/sh -e
+#!/usr/bin/perl -w
 #
 # Do some general file permission fixups.
 
-PATH=debian:$PATH:/usr/lib/debhelper
-source dh_lib
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
+use Dh_Lib;
+init();
 
-# General things..
-if [ -d debian/tmp ]; then
-	doit "chown -R root.root debian/tmp"
-	doit "chmod -R go=rX debian/tmp"
-fi
+foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
+	$TMP=tmpdir($PACKAGE);
 
-# Fix up premissions in /usr/doc, setting everything to not exectable
-# by default.
-files=`find debian/tmp/usr/doc -type f 2>/dev/null | tr "\n" " "` || true
-if [ "$files" ]; then
-	doit "chmod 644 $files"
-fi
-files=`find debian/tmp/usr/doc -type d 2>/dev/null | tr "\n" " "` || true
-if [ "$files" ]; then
-	doit "chmod 755 $files"
-fi
+	if (! defined($dh{EXCLUDE_FIND}) || $dh{EXCLUDE_FIND} eq '') {
+		$find_options="";
+	}
+	else {
+		$find_options="! \\( $dh{EXCLUDE_FIND} \\)";
+	}
 
-# Executable man pages is just not done.
-files=`find debian/tmp/usr/man/ debian/tmp/usr/X11*/man/ -type f 2>/dev/null | tr "\n" " "` || true
-if [ "$files" ]; then
-	doit "chmod 644 $files"
-fi
+	# 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/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");
+
+	# 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");
+
+	# ..and so are executable shared and static libraries 
+	# (and .la files from libtool)
+	complex_doit("find $TMP -perm -5 -type f",
+		"\\( -name '*.so*' -or -name '*.la' -or -name '*.a' \\) $find_options -print0",
+		"2>/dev/null | xargs -0r chmod a-X");
+}