X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_shlibdeps;h=e5f73cbabaa24925f9480e47d5f316de322ce2cd;hb=af351ff3d870c0559afd79fad0341f6a558e3900;hp=e705d73b79a77deed15fe651a7fe418f6362d4de;hpb=3b3753e15a4961078aab74f1a74aacfa0de97dee;p=debhelper.git

diff --git a/dh_shlibdeps b/dh_shlibdeps
index e705d73..e5f73cb 100755
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -82,10 +82,14 @@ libfoo, and is installed into /usr/lib/bar/, you can make libfoo-bin depend
 on libbar1 as follows:
 
 	dh_shlibdeps -Llibbar1 -l/usr/lib/bar
-
+	
 =cut
 
-init();
+init(options => {
+	"L|libpackage=s" => \$dh{LIBPACKAGE},
+	"dpkg-shlibdeps-params=s", => \$dh{U_PARAMS},
+	"l=s", => \$dh{L_PARAMS},
+});
 
 if ($dh{L_PARAMS}) {
 	my @paths=();
@@ -108,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;
 
@@ -117,9 +126,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 -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)/!;
+		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
 		# multiple files..
 		$ff=`file "$file"`;