dpkg-shlibdeps: accepts empty dependencies in shlibs files

diff --git a/ChangeLog b/ChangeLog
index be1775e6f87e82b4fd291fdeff29ef2b9485b459..bd9ba19b888793bf6b81515621added833b70c8c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2007-11-22  Raphael Hertzog  <hertzog@debian.org>
 
-       * scripts/dpkg-shlibdeps.pl: Add more debug messages.
+       * scripts/dpkg-shlibdeps.pl: Add more debug messages. Accept empty
+       dependencies in shlibs files again.
 
 2007-11-21  Raphael Hertzog  <hertzog@debian.org>
 

diff --git a/debian/changelog b/debian/changelog
index e784fa056713f03d2fb0ecafa86c85ddadb594b7..5cfc88985867d3b3d78d4c6a8f02ed995237502b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ dpkg (1.14.10) UNRELEASED; urgency=low
     Closes: #452262
   * Add more debug messages to dpkg-shlibdeps to ease collecting information
     in case of problems.
+  * dpkg-shlibdeps now accepts again empty dependencies in shlibs files.
 
   [ Updated man pages translations ]
   * Swedish (Peter Karlsson)

diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index 800460dfac8053ff1356a8330b7267ba2cb9fef7..6120b668bad31db4e82f3ee7dd5b704245019f84 100755 (executable)
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -369,11 +369,12 @@ sub extract_from_shlibs {
     while (<SHLIBS>) {
        s/\s*\n$//;
        next if m/^\#/;
-       if (!m/^\s*(?:(\S+):\s+)?(\S+)\s+(\S+)\s+(\S.*\S)\s*$/) {
+       if (!m/^\s*(?:(\S+):\s+)?(\S+)\s+(\S+)(?:\s+(\S.*\S))?\s*$/) {
            warning(_g("shared libs info file \`%s' line %d: bad line \`%s'"),
                    $shlibfile, $., $_);
            next;
        }
+       my $depread = defined($4) ? $4 : '';
        if (($libname eq $2) && ($libversion eq $3)) {
            # Define dep and end here if the package type explicitely
            # matches. Otherwise if the packagetype is not specified, use
@@ -381,11 +382,11 @@ sub extract_from_shlibs {
            # line
            if (defined($1)) {
                if ($1 eq $packagetype) {
-                   $dep = $4;
+                   $dep = $depread;
                    last;
                }
            } else {
-               $dep = $4 unless defined $dep;
+               $dep = $depread unless defined $dep;
            }
        }
     }