]> git.donarmstrong.com Git - debhelper.git/commitdiff
merge
authorJoey Hess <joey@kitenet.net>
Tue, 8 Feb 2011 19:26:28 +0000 (15:26 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 8 Feb 2011 19:26:28 +0000 (15:26 -0400)
1  2 
dh_makeshlibs
dh_strip

diff --cc dh_makeshlibs
index 045e9450cba72fee21400464e985c23f4b8b516a,652def3a2b63226de5fe1c40cbf7caf8c363b37a..29d3f4d3e53481ae5c16cdecdbfc8113c1525227
@@@ -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);
-               my $objdump=`objdump -p $_`;
 +              push @lib_files, $_;
+               my $objdump=`$od -p $_`;
                if ($objdump=~m/\s+SONAME\s+(.+)\.so\.(.+)/) {
                        # proper soname format
                        $library=$1;
diff --cc dh_strip
Simple merge