From 225d86509ae859057d89f3ad88c1b6de7c8e98ba Mon Sep 17 00:00:00 2001 From: joey Date: Tue, 17 Aug 1999 04:58:40 +0000 Subject: [PATCH] r115: Initial Import --- debian/changelog | 7 +++++++ dh_clean | 2 +- dh_fixperms | 6 +++--- doc/TODO | 3 +++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 725f2ac..f1a479e 100644 --- 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 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 3388f14..544c09a 100755 --- 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 544ee9b..0e84533 100755 --- 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 a4e4a10..460abc6 100644 --- 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. + -- 2.39.5