r395: * dh_makeshlibs: corrected the evil db3-regex so it doesn't misfire on

     data like "debian/libruby/usr/lib/ruby/1.6/i486-linux/etc.so".
     Closes: #78139

diff --git a/debian/changelog b/debian/changelog
index c43333ae71e1eb15fa49e57430fa3e19b828322a..54c6a391fe546884f6e5173f08379465e8fc3754 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (2.2.2) unstable; urgency=low
+
+  * dh_makeshlibs: corrected the evil db3-regex so it doesn't misfire on
+    data like "debian/libruby/usr/lib/ruby/1.6/i486-linux/etc.so".
+    Closes: #78139
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 27 Nov 2000 12:21:53 -0800
+
 debhelper (2.2.1) unstable; urgency=low
 
   * Reverted the change to make debian/README be treated as README.Debian,

diff --git a/dh_makeshlibs b/dh_makeshlibs
index 1b50ea115a7e7bae350c30d7d12b9c3c53bfa85a..8f3e7a7ae0a411ecba24267b9e0aff92d35ea413 100755 (executable)
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -19,7 +19,7 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
                $need_ldconfig=1;
                # The second evil regexp is for db3, whose author should
                # be shot.
-               if (m#.*/(.*)\.so\.(\d*)\.?# || m#.*/(.*)-(\S+)\.so$#) {
+               if (m#.*/([^/]*)\.so\.(\d*)\.?# || m#.*/([^/]*)-([^\s/]+)\.so$#) {
                        $library = $1;
                        $major = $2;
                }