r388: * Ok, I tihnk we have a db3 fix that will really work now.

diff --git a/debian/changelog b/debian/changelog
index a90362e45721e03f8df300dcc4357c25e749a232..72a698e36872b1b3187cfaf2ecf9efbe54550b6d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
+debhelper (2.1.25) unstable; urgency=low
+
+  * Ok, I tihnk we have a db3 fix that will really work now.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 12 Nov 2000 13:29:59 -0800
+
 debhelper (2.1.24) unstable; urgency=low
 
   * I retract 2.1.23, the hack doesn't help make dpkg-shlibdeps work; db3
     is broken upstream.
 
- -- Joey Hess <joeyh@debian.org>  Sat, 11 Nov 2000 17:35:34 -0800
+ -- Joey Hess <joeyh@debian.org>  Sun, 12 Nov 2000 13:29:57 -0800
 
 debhelper (2.1.23) unstable; urgency=low
 

diff --git a/dh_makeshlibs b/dh_makeshlibs
index a9770717ee89b2b10178e0ed331bd35c91b6cc88..6c708e8676c0ae936d4208623d91d17f152938a2 100755 (executable)
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -15,7 +15,12 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
        open (FIND, "find $TMP -xtype f -name '*.so.*' |");
        while (<FIND>) {
                chomp;
-               ($library, $major)=m#.*/(.*)\.so\.(\d*)\.?#;
+               # The second evil regexp is for db3, whose author should
+               # be shot.
+               if (m#.*/(.*)\.so\.(\d*)\.?# || m#.*/(.*)-(\S+)\.so$#) {
+                       $library = $1;
+                       $major = $2;
+               }
                if (defined($dh{M_PARAMS}) && $dh{M_PARAMS} ne '') {
                        $major=$dh{M_PARAMS};
                }