r166: Initial Import

diff --git a/debian/changelog b/debian/changelog
index ddd2e33a1c33bb92832f8a62d44cc76ea7122738..6b36d7b097046a5afbd3fd011bac84166288eed5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (1.2.30) unstable; urgency=low
+
+  * dh_fixperms: cut down the number of chmod commands that are executed
+    from 3 to 1, no change in functionality.
+
+ -- Joey Hess <joeyh@master.debian.org>  Mon,  1 Feb 1999 17:05:29 -0800
+
 debhelper (1.2.29) unstable; urgency=high
 
   * Do not include bogus chsh, chfn, passwd links in debhelper binary!

diff --git a/dh_fixperms b/dh_fixperms
index 10baaa0141d5ed9c327abffb52c1546bce4c341b..6825ed6d54f5c2c619886dec0bddf2676445e819 100755 (executable)
--- a/dh_fixperms
+++ b/dh_fixperms
@@ -15,9 +15,7 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
                # this if there is nothing to exclude.
                if (-d $TMP) {
                        doit("chown","-R","root.root",$TMP);
-                       doit("chmod","-R","go=rX",$TMP);
-                       doit("chmod","-R","u+rw",$TMP);
-                       doit("chmod","-R","a-s",$TMP);
+                       doit("chmod","-R","go=rX,u+rw,a-s",$TMP);
                }
 
                $find_options="";
@@ -27,11 +25,7 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
                complex_doit("find $TMP ! \\( $dh{EXCLUDE_FIND} \\) -print0 \
                        2>/dev/null | xargs -0r chown root.root");
                complex_doit("find $TMP ! \\( $dh{EXCLUDE_FIND} \\) -print0 \
-                       2>/dev/null | xargs -0r chmod go=rX");
-               complex_doit("find $TMP ! \\( $dh{EXCLUDE_FIND} \\) -print0 \
-                       2>/dev/null | xargs -0r chmod u+rw");
-               complex_doit("find $TMP ! \\( $dh{EXCLUDE_FIND} \\) -print0 \
-                       2>/dev/null | xargs -0r chmod a-s");
+                       2>/dev/null | xargs -0r chmod go=rX,u+rw,a-s");
 
                $find_options="! \\( $dh{EXCLUDE_FIND} \\)";
        }

diff --git a/dh_installinit.1 b/dh_installinit.1
index f76ec9170113385a13f7799b4c0b2e18061a329c..bef681cbacaac6a2700af15af567be29025f7df7 100644 (file)
--- a/dh_installinit.1
+++ b/dh_installinit.1
@@ -39,7 +39,7 @@ the --init-script parameter described below.)
 .B \-uparams, \--update-rcd-params=params
 Pass "params" to 
 .BR update-rc.d (8)
-If not specified, "default" will be passed to
+If not specified, "defaults" will be passed to
 .BR update-rc.d (8)
 .TP
 .B \--init-script=scriptname