From: Joey Hess <joey@kitenet.net>
Date: Tue, 8 Feb 2011 19:26:28 +0000 (-0400)
Subject: merge
X-Git-Tag: 8.1.1~5
X-Git-Url: https://git.donarmstrong.com/?p=debhelper.git;a=commitdiff_plain;h=7bc99d44cfc0275e1b44b390bed1362c457da9ab

merge
---

7bc99d44cfc0275e1b44b390bed1362c457da9ab
diff --cc dh_makeshlibs
index 045e945,652def3..29d3f4d
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@@ -145,8 -153,7 +152,8 @@@ foreach my $package (@{$dh{DOPACKAGES}}
  	open (FIND, "find $tmp -type f \\( -name '*.so' -or -name '*.so.*' \\) $exclude |");
  	while (<FIND>) {
  		my ($library, $major);
 +		push @lib_files, $_;
- 		my $objdump=`objdump -p $_`;
+ 		my $objdump=`$od -p $_`;
  		if ($objdump=~m/\s+SONAME\s+(.+)\.so\.(.+)/) {
  			# proper soname format
  			$library=$1;