dh_installman: Avoid converting .so links to symlinks if the link target is not prese...

diff --git a/debian/changelog b/debian/changelog
index 594ef7c8107db9b3511c2816ceadff87ae612be5..fa04d07801b75464f99733e27763def96a7af068 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 debhelper (7.4.21) UNRELEASED; urgency=low
 
   * dh_installman: Support .so links relative to the current section.
+  * dh_installman: Avoid converting .so links to symlinks if the link
+    target is not present in the same binary package, on advice of 
+    Colin Watson. (To support eventual so search paths.)
 
  -- Joey Hess <joeyh@debian.org>  Mon, 17 May 2010 20:01:19 -0400
 

diff --git a/dh_installman b/dh_installman
index 1a5750b86a16f6ad7b7cdb7ca231fbc16f095765..703b70bc3c8a93531eb6e522657f579cc7483723 100755 (executable)
--- a/dh_installman
+++ b/dh_installman
@@ -248,8 +248,10 @@ sub find_so_man {
                        $solink="../$solink";
                }
        
-               push @sofiles,"$File::Find::dir/$_";
-               push @sodests,$solink;
+               if (-e $solink || -e "$solink.gz") {
+                       push @sofiles,"$File::Find::dir/$_";
+                       push @sodests,$solink;
+               }
        }
 }