diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-01-20 15:27:55 -0500 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-01-20 15:27:55 -0500 |
| commit | 3b3753e15a4961078aab74f1a74aacfa0de97dee (patch) | |
| tree | aba4d788706481994722d39947a875ab83e917e9 /dh_shlibdeps | |
| parent | a8ffa92f236e4a72287f6dc7487d0538e2e6656d (diff) | |
| download | debhelper-3b3753e15a4961078aab74f1a74aacfa0de97dee.tar.gz | |
* 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
Diffstat (limited to 'dh_shlibdeps')
| -rwxr-xr-x | dh_shlibdeps | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/dh_shlibdeps b/dh_shlibdeps index a076537a..e705d73b 100755 --- 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"`; |