Dpkg::Shlibs::find_library() now returns canonicalized paths

diff --git a/ChangeLog b/ChangeLog
index 783dad8e56a93740b54e0c5aecc5ce99664a2f57..18a74b39b316bbe321521482a919a211ad4a5c66 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
        * scripts/dpkg-gensymbols.pl: Add a new -I<file> option to force
        the usage of a specific file as basis for the generated symbols
        file.
+       * scripts/Dpkg/Shlibs.pm (find_library): Canonicalize paths before
+       returning them as bad RPATH can lead to non-canonical paths
+       causing us troubles in dpkg-shlibdeps.
 
 2007-11-24  Guillem Jover  <guillem@debian.org>
 

diff --git a/debian/changelog b/debian/changelog
index e71a9616518859f1386cc1c9345a40a9ce153f2c..edaabd241693ca76c1d62f8bf27200d2a8be9048 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dpkg (1.14.12) UNRELEASED; urgency=low
 
-  *
+  [ Raphael Hertzog ]
+  * Dpkg::Shlibs::find_library() now returns canonicalized paths.
 
  -- Guillem Jover <guillem@debian.org>  Sat, 24 Nov 2007 07:38:13 +0200
 

diff --git a/scripts/Dpkg/Shlibs.pm b/scripts/Dpkg/Shlibs.pm
index 03916bb5fd6dcd949a424c96a895429e4d96b317..247ddcff90895597418fbb733c271f7d30d00994 100644 (file)
--- a/scripts/Dpkg/Shlibs.pm
+++ b/scripts/Dpkg/Shlibs.pm
@@ -22,6 +22,8 @@ use warnings;
 use base qw(Exporter);
 our @EXPORT_OK = qw(@librarypaths find_library);
 
+use File::Spec;
+
 use Dpkg::Gettext;
 use Dpkg::ErrorHandling qw(syserr);
 use Dpkg::Shlibs::Objdump;
@@ -78,7 +80,7 @@ sub find_library {
        if (-e "$root$dir/$lib") {
            my $libformat = Dpkg::Shlibs::Objdump::get_format("$root$dir/$lib");
            if ($format eq $libformat) {
-               return "$root$dir/$lib";
+               return File::Spec->canonpath("$root$dir/$lib");
            }
        }
     }