r67: Initial Import

diff --git a/debian/changelog b/debian/changelog
index 282e3cd21e1d9661c449e199ad4090edc1aad739..86b7f4ace66156fef2b9b3b55a5db4e5a93ff613 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (0.70) unstable; urgency=low
+
+  * dh_lib: autoscript(): no longer add the modification date to the
+    comments aurrounding debhelper-added code. I don't think this date was
+    gaining us anything, so let's remove it and save some disk space.
+
+ -- Joey Hess <joeyh@master.debian.org>  Sun,  8 Mar 1998 21:15:13 -0800
+
 debhelper (0.69) unstable; urgency=low
 
   * Refer to suidregister (8), not (1). Bug #19149.

diff --git a/dh_lib b/dh_lib
index ae2d32f6c1a15afc4b5588c4f9c654ffb3118daf..2e11695f468e80ac472db6aca73c6f498103c0f2 100644 (file)
--- a/dh_lib
+++ b/dh_lib
@@ -207,11 +207,3 @@ for PACKAGE in $DH_DOPACKAGES ; do
        DH_FIRSTPACKAGE="$PACKAGE"
        break
 done
-
-# Check to see if: DH_FIRSTPACKAGE is not the MAINPACKAGE, and
-# some command line arguements are passed. Display a warning, becuase
-# debhelper's behaviour has changed in this case.
-if [ "$DH_FIRSTPACKAGE" != "$MAINPACKAGE" -a "$*" ]; then
-       echo `basename $0`": Warning: my behavior has changed, and command line" >&2
-       echo `basename $0`": arguments \"$*\" will apply to package \"$DH_FIRSTPACKAGE\"" >&2
-fi

diff --git a/dh_makeshlibs b/dh_makeshlibs
index 28695552a51e1f6a918db3488ab2a6ccdd994fd0..2f8cdaa2c84e1f3499c1f64d2333beefa4a00637 100755 (executable)
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -30,7 +30,7 @@ for PACKAGE in $DH_DOPACKAGES; do
                        else
                                # Call isnative becuase it sets $VERSION
                                # as a side effect.
-                               isnative
+                               isnative || true
                                PACKAGE="$PACKAGE (>= $VERSION)"
                        fi
                fi