r115: Initial Import

diff --git a/debian/changelog b/debian/changelog
index 725f2ac649f517c360e9b0a263dc87cd1547f3e9..f1a479e431d306a01576fd4e1fc7736c95ddc7a3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (1.1.9) unstable; urgency=low
+
+  * dh_fixperms: has been removing the +x bits of all doc/*/examples/* files
+    since version 0.97 or so. Fixed.
+
+ -- Joey Hess <joeyh@master.debian.org>  Sun, 16 Aug 1998 17:11:48 -0700
+
 debhelper (1.1.8) unstable; urgency=low
 
   * Dh_Lib.pm: made U_PARAMS an array of parameters.

diff --git a/dh_clean b/dh_clean
index 3388f146977e4838137345cf827d8637588f38cc..544c09a0740444e3ba67346ab426b63fba249223 100755 (executable)
--- a/dh_clean
+++ b/dh_clean
@@ -25,7 +25,7 @@ if (@ARGV) {
 }
 
 if (! $dh{K_FLAG}) {
-       doit("rm","-f","debian/files*");
+       doit("rm","-f","debian/files");
 }
 
 # Remove other temp files.

diff --git a/dh_fixperms b/dh_fixperms
index 544ee9be9dd50805360e89a6ede751abc97abd93..0e845335cb8f6327cf44142f3c4347df92b1fc2c 100755 (executable)
--- a/dh_fixperms
+++ b/dh_fixperms
@@ -18,7 +18,7 @@ for PACKAGE in $DH_DOPACKAGES; do
                        doit "chmod -R u+rw $TMP"
                fi
 
-               FIND_OPTIONS=
+               FIND_OPTIONS=""
        else
                # Do it the hard way.
                complex_doit "find $TMP ! \( $DH_EXCLUDE_FIND \) -print0 \
@@ -33,8 +33,8 @@ for PACKAGE in $DH_DOPACKAGES; do
 
        # 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 -print0 \
-               2>/dev/null | xargs -0r chmod 644"
+       complex_doit "find $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 \
                2>/dev/null | xargs -0r chmod 755"
 

diff --git a/doc/TODO b/doc/TODO
index a4e4a10d4bbf7083a3fc80969cfbb231f03619ca..460abc63eb1a5484e9623ed9c5836b6083c44a6d 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -69,3 +69,6 @@ Fixes to backport to 1.0 tree:
 
 * dh_installdocs used -m 655 for a TODO file. (minor, dh_fixperms cleans up
        after it)
+* dh_fixperms had a problkem with removing x bits on examples files -
+       backport fix.
+