r102: Initial Import

diff --git a/debian/changelog b/debian/changelog
index cf103bd888ad08c978737821be7b2375aa0da678..db56690c9c24e8373b8aa8500508b319e93d6205 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+debhelper (1.0) stable unstable; urgency=low
+
+  * 1.0 at last!
+  
+  * This relelase is not really intended for stable. I throw a copy into
+    stable-updates because I want it to be available as an upgrade for
+    people using debian 2.0 (the current version in debian 2.0 has no
+    critical bugs, but this version is of course a lot nicer), and I plan
+    to start work on a new branch of debhelper that will fix many wishlist
+    bug reports, and of course introduce many new bugs, and which will go
+    into unstable only.
+
+ -- Joey Hess <joeyh@master.debian.org>  Sat,  8 Aug 1998 17:33:20 -0700
+
 debhelper (0.99.4) unstable; urgency=low
 
   * dh_debstd: only warn about scripts that actually lack #DEBHELPER#.

diff --git a/dh_compress b/dh_compress
index 1b58f70a19f85a7a6cbb268f634487d3cd4e6cc3..7d6e4979ade9cef8456959980e5ded3e035e386e 100755 (executable)
--- a/dh_compress
+++ b/dh_compress
@@ -13,7 +13,7 @@ filelist () {
        if [ "$compress" ]; then
                # The config file is a sh script that outputs the files to be compressed
                # (typically using find).
-               sh $olddir/$compress 2>/dev/null
+               sh $olddir/$compress 2>/dev/null || true
        else
                # By default fall back on what the policy manual says to compress.
                find usr/info usr/man usr/X11*/man -type f ! -name "*.gz" 2>/dev/null || true

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/dh_installdocs b/dh_installdocs
index fcdedc500fed9cd119d6d1adb7eeaebfd4a0af16..7a11b7f7c7b53b23e31f5f834c67e3343bde54ef 100755 (executable)
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -41,7 +41,7 @@ for PACKAGE in $DH_DOPACKAGES; do
        todo=`pkgfile $PACKAGE TODO`
        if [ "$todo" ]; then
                if isnative; then
-                       doit "install -m 655 -p $todo $TMP/usr/doc/$PACKAGE/TODO"
+                       doit "install -m 644 -p $todo $TMP/usr/doc/$PACKAGE/TODO"
                else
                        doit "install -m 644 -p $todo $TMP/usr/doc/$PACKAGE/TODO.Debian"
                fi