r448: * dh_makeshlibs: only generate call to ldconfig if it really looks like

     a given *.so* file is indeed a shared library.

diff --git a/debhelper.pod b/debhelper.pod
index 4723036e0d8da5178e2bb437175ab755be57ab32..a93034e55da8fa200f263a66d519a0a63de39058 100644 (file)
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -234,7 +234,7 @@ turn this off and use those characters raw, just prefix with a backslash.
 
 dh_makeshlibs makes the postinst and postrm scripts call ldconfig.
 
-=item 
+=item -
 
 Every file in etc/ is automatically flagged as a conffile by dh_installdeb.
 

diff --git a/debian/changelog b/debian/changelog
index 7a235fc9761b16aa4921292f5d7d2c3186a0da35..bd59672e50a28f0e1771139d3c5da3cd9456bae1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (3.0.7) unstable; urgency=low
+
+  * dh_makeshlibs: only generate call to ldconfig if it really looks like 
+    a given *.so* file is indeed a shared library.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 23 Feb 2001 14:38:50 -0800
+
 debhelper (3.0.6) unstable; urgency=low
 
   * Corrected some uninitialized value stuff in dh_suidregister (actually

diff --git a/debian/control b/debian/control
index eaef624d0de18709290efae55a5375f1d63a8854..48ad49b725bfd39df6ebc92b2d9759eeddf3dec3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Joey Hess <joeyh@debian.org>
 Build-Depends-Indep: perl-5.6, fileutils (>= 4.0-2.1), file (>= 3.23-1)
-Standards-Version: 3.5.1.0
+Standards-Version: 3.5.2.0
 
 Package: debhelper
 Architecture: all

diff --git a/dh_makeshlibs b/dh_makeshlibs
index de29453c21e1c63c6ecdbca79f4ddb8c13e00f85..1888ee2d54f46112dc2e79cbcf4fc0451c94b68d 100755 (executable)
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -94,7 +94,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                my $major;
        
                chomp;
-               $need_ldconfig=1;
                # The second evil regexp is for db3, whose author should
                # be shot.
                if (m#.*/([^/]*)\.so\.(\d*)\.?# || m#.*/([^/]*)-([^\s/]+)\.so$#) {
@@ -121,6 +120,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                }
                if (defined($library) && defined($major) && defined($deps) &&
                    $library ne '' && $major ne '' && $deps ne '') {
+                       $need_ldconfig=1;
                        # Prevent duplicate lines from entering the file.
                        my $line="$library $major $deps";
                        if (! $seen{$line}) {