r534: * Stupid, evil typo.

   * Fixed the tests clint didn't show me.

diff --git a/autoscripts/postinst-init-norestart b/autoscripts/postinst-init-norestart
index 4f1c63f93a12c3060c25e90128b1b80721f59114..a5741654933315e1489bc74014542a247a63aa5e 100644 (file)
--- a/autoscripts/postinst-init-norestart
+++ b/autoscripts/postinst-init-norestart
@@ -1,7 +1,7 @@
 if [ -x "/etc/init.d/#SCRIPT#" ]; then
        update-rc.d #SCRIPT# #INITPARMS# >/dev/null
        if [ "$1" = "configure" ]; then
-               if [ -z "$2" -o "$2" = "<unknown>" ]; then
+               if [ -z "$2" ] || [ "$2" = "<unknown>" ]; then
                        /etc/init.d/#SCRIPT# start
                fi
        fi

diff --git a/autoscripts/postinst-init-norestart-invoke b/autoscripts/postinst-init-norestart-invoke
index 440e8c7851fd89f04903406e75fde98c2ca7018b..be1751c8fae1f3727b0b0ed5c20b72708527098a 100644 (file)
--- a/autoscripts/postinst-init-norestart-invoke
+++ b/autoscripts/postinst-init-norestart-invoke
@@ -1,7 +1,7 @@
 if [ -x "/etc/init.d/#SCRIPT#" ]; then
        update-rc.d #SCRIPT# #INITPARMS# >/dev/null
        if [ "$1" = "configure" ]; then
-               if [ -z "$2" -o "$2" = "<unknown>" ]; then
+               if [ -z "$2" ] || [ "$2" = "<unknown>" ]; then
                        invoke-rc.d #SCRIPT# start
                fi
        fi

diff --git a/autoscripts/prerm-doc b/autoscripts/prerm-doc
index 05abb49501c6e4fe81ec47cc7aa6a964726ec7f7..bd77868318c8754a4a632f1be3bbf5c6ab517d51 100644 (file)
--- a/autoscripts/prerm-doc
+++ b/autoscripts/prerm-doc
@@ -1,4 +1,4 @@
-if [ "$1" = "upgrade" ] || [ "$1" = "remove" ] && [ -L /usr/doc/#PACKAGE#
+if [ "$1" = "upgrade" ] || [ "$1" = "remove" ] && [ -L /usr/doc/#PACKAGE# ]
 then
        rm -f /usr/doc/#PACKAGE#
 fi

diff --git a/autoscripts/prerm-doc-base b/autoscripts/prerm-doc-base
index 7ec95b7c2d0e21a5686464a827e402cabb4c29d4..c57d999a2edff9e58db861de1a860ca9b66296df 100644 (file)
--- a/autoscripts/prerm-doc-base
+++ b/autoscripts/prerm-doc-base
@@ -1,4 +1,4 @@
-if [ "$1" = remove -o "$1" = upgrade ] && \
+if [ "$1" = remove ] || [ "$1" = upgrade ] && \
    which install-docs >/dev/null 2>&1; then
        install-docs -r #DOC-ID#
 fi

diff --git a/debian/changelog b/debian/changelog
index 221eb8cb2ad6b4120d6619ce36bc30f9b4892c2d..b7d863631f0f52b68c9fa23a44628ec8c72df1a5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (4.0.15) unstable; urgency=low
+
+  * Stupid, evil typo.
+  * Fixed the tests clint didn't show me.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 20 Jun 2002 20:57:06 -0400
+
 debhelper (4.0.14) unstable; urgency=low
 
   * In script fragments, use more posix tests, no -a or -o, no parens.

diff --git a/dh_suidregister b/dh_suidregister
index 05db06e1a21f183c532cd4b78e7dca20972b2826..263e7278ee0e7e15ea746a1401398f7173569f1e 100755 (executable)
--- a/dh_suidregister
+++ b/dh_suidregister
@@ -104,7 +104,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        }
 
        if (@files) {
-               # So we would have registered some files before.
                warning("This program should no longer be used. Please read the dh_suidregister(1) man page.");
                $notused=0;
        }