Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper

[debhelper.git] / dh_shlibdeps

diff --git a/dh_shlibdeps b/dh_shlibdeps
index 320f2501fec587407162c81d81b06a3c78dba141..e5f73cbabaa24925f9480e47d5f316de322ce2cd 100755 (executable)
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -87,7 +87,6 @@ on libbar1 as follows:
 
 init(options => {
        "L|libpackage=s" => \$dh{LIBPACKAGE},
-       "add-udeb=s" => \$dh{SHLIBS_UDEB},
        "dpkg-shlibdeps-params=s", => \$dh{U_PARAMS},
        "l=s", => \$dh{L_PARAMS},
 });
@@ -113,6 +112,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        my $tmp=tmpdir($package);
        my $ext=pkgext($package);
 
+       # dpkg-shlibdeps expects this directory to exist
+       if (! -d "$tmp/DEBIAN") {
+               doit("install","-o",0,"-g",0,"-d","$tmp/DEBIAN");
+       }
+
        my @filelist;
        my $ff;
 
@@ -122,7 +126,7 @@ 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 -type f \\( -perm +111 -or -name "*.so*" \\) $find_options -print`)) {
+       foreach my $file (split(/\n/,`find $tmp -type f \\( -perm +111 -or -name "*.so*" -or -name "*.cmxs" \\) $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|emul)/!;
                # TODO this is slow, optimize. Ie, file can run once on