* dh_shlibdeps: Rather than skipping everything in /usr/lib/debug,

  which can include debug libraries that dpkg-shlibdeps should look at,
  only skip the subdirectories of it that contain separate debugging
  symbols. (Hardcoding the names of those directories is not the best
  implementation, but it will do for now.) Closes: #461339

diff --git a/debian/changelog b/debian/changelog
index 29419c3e0813ccc3e5f9263eec5c63818d8ae72b..38d1068de0c672c559eb81701ae69db822d359ce 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ debhelper (6.0.3) UNRELEASED; urgency=low
 
   * dh_link: -X can be used to avoid it modifying symlinks to be compliant
     with policy. Closes: #461392
+  * dh_shlibdeps: Rather than skipping everything in /usr/lib/debug,
+    which can include debug libraries that dpkg-shlibdeps should look at,
+    only skip the subdirectories of it that contain separate debugging
+    symbols. (Hardcoding the names of those directories is not the best
+    implementation, but it will do for now.) Closes: #461339
 
  -- Joey Hess <joeyh@debian.org>  Fri, 18 Jan 2008 12:29:15 -0500
 

diff --git a/dh_shlibdeps b/dh_shlibdeps
index a076537a8790cf4d6ab5d5f6049a5dea1e23e9f9..e705d73b79a77deed15fe651a7fe418f6362d4de 100755 (executable)
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -117,7 +117,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') {
                $find_options="! \\( $dh{EXCLUDE_FIND} \\)";
        }
-       foreach my $file (split(/\n/,`find $tmp -path $tmp/usr/lib/debug -prune -or -type f \\( -perm +111 -or -name "*.so*" \\) $find_options -print`)) {
+       foreach my $file (split(/\n/,`find $tmp -type f \\( -perm +111 -or -name "*.so*" \\) $find_options -print`)) {
+               # Prune directories that contain separated debug symbols.
+               next if $file=~m!^\Q$tmp\E/usr/lib/debug/(lib|lib64|usr|bin|sbin|opt|dev)/!;
                # TODO this is slow, optimize. Ie, file can run once on
                # multiple files..
                $ff=`file "$file"`;