summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-01-20 15:27:55 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-01-20 15:27:55 -0500
commit3b3753e15a4961078aab74f1a74aacfa0de97dee (patch)
treeaba4d788706481994722d39947a875ab83e917e9
parenta8ffa92f236e4a72287f6dc7487d0538e2e6656d (diff)
* 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
-rw-r--r--debian/changelog5
-rwxr-xr-xdh_shlibdeps4
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 29419c3..38d1068 100644
--- 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 a076537..e705d73 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"`;