r74: Initial Import

diff --git a/debian/changelog b/debian/changelog
index 8124e62c323dbec58a45049db0e90ddbe2f06d4d..567dbb9f9999d3f2de81a9979b949e57c8a9d9b8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,14 @@
+debhelper (0.76) frozen unstable; urgency=low
+
+  * I intended version 0.75 to make it in before the freeze, and it did not.
+    This is just to get it into frozen. There are no changes except bug
+    fixes.
+
+ -- Joey Hess <joeyh@master.debian.org>  Thu, 26 Mar 1998 12:25:47 -0800
+
 debhelper (0.75) unstable; urgency=low
 
-  * Actually exit if there is an unknown option onthe command line (oooops!)
+  * Actually exit if there is an unknown option on the command line (oooops!)
   * Fix .so file conversion to actually work (#19933).
 
  -- Joey Hess <joeyh@master.debian.org>  Thu, 19 Mar 1998 11:54:58 -0800

diff --git a/dh_makeshlibs b/dh_makeshlibs
index 2f8cdaa2c84e1f3499c1f64d2333beefa4a00637..eb88f448363fc902288ac99b5aa0486e6500e20c 100755 (executable)
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -12,7 +12,7 @@ for PACKAGE in $DH_DOPACKAGES; do
                error "$TMP/DEBIAN/shlibs already exists."
        fi
 
-       for file in `find $TMP -type f -name "*.so*" | tr "\n" " "` ; do
+       for file in `find $TMP -type f -name "*.so.*" | tr "\n" " "` ; do
                LIBRARY=`expr $file : ".*/\(.*\)\.so\..*"` || true
                LIB_VERSION=`expr $file : ".*/.*\.so\.\(.*\)"` || true
                if [ -z "$DH_M_PARAMS" ]; then
@@ -24,17 +24,20 @@ for PACKAGE in $DH_DOPACKAGES; do
                if [ ! -d "$TMP/DEBIAN" ] ; then
                        doit "install -d $TMP/DEBIAN"
                fi
+               DEPS=$PACKAGE
                if [ "$DH_V_FLAG_SET" ]; then
                        if [ "$DH_V_FLAG" ]; then
-                               PACKAGE="$DH_V_FLAG"
+                               DEPS="$DH_V_FLAG"
                        else
                                # Call isnative becuase it sets $VERSION
                                # as a side effect.
                                isnative || true
-                               PACKAGE="$PACKAGE (>= $VERSION)"
+                               DEPS="$PACKAGE (>= $VERSION)"
                        fi
                fi
-               complex_doit "echo '$LIBRARY $MAJOR $PACKAGE' >>$TMP/DEBIAN/shlibs"
+               if [ "$LIBRARY" -a "$MAJOR" -a "$DEPS" ]; then
+                       complex_doit "echo '$LIBRARY $MAJOR $DEPS' >>$TMP/DEBIAN/shlibs"
+               fi
        done
 
        if [ -e "$TMP/DEBIAN/shlibs" ]; then