diff options
| author | joey <joey> | 2000-11-12 21:31:01 +0000 |
|---|---|---|
| committer | joey <joey> | 2000-11-12 21:31:01 +0000 |
| commit | ed032dcadfb52bed9bfc5fe2e4dfde1f8e034b34 (patch) | |
| tree | b80fea8d9d5bfbb349e181e261da66de7d00368c | |
| parent | 2aa8e7bbb662f3ea43a03441dbcc6c7a3acb91a5 (diff) | |
| download | debhelper-ed032dcadfb52bed9bfc5fe2e4dfde1f8e034b34.tar.gz | |
r388: * Ok, I tihnk we have a db3 fix that will really work now.
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | dh_makeshlibs | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index a90362e4..72a698e3 100644 --- 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 a9770717..6c708e86 100755 --- 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}; } |