Man page fixes about what program -u passes params to. Closes: #593342

[debhelper.git] / dh_shlibdeps

diff --git a/dh_shlibdeps b/dh_shlibdeps
index e859f04aa3abc351b486156dc3b7b23e2675fd0a..34120c3a1f65e35d0b7636e4204de9b762ed6c88 100755 (executable)
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -27,12 +27,6 @@ a list of ELF executables and shared libraries it has found.
 
 =over 4
 
-=item B<-u>I<params>, B<--dpkg-shlibdeps-params=>I<params>
-
-=item B<--> I<params>
-
-Pass "params" to L<dpkg-shlibdeps(1)>.
-
 =item B<-X>I<item>, B<--exclude=>I<item>
 
 Exclude files that contain "item" anywhere in their filename from being
@@ -40,6 +34,15 @@ passed to dpkg-shlibdeps. This will make their dependencies be ignored.
 This may be useful in some situations, but use it with caution. This option
 may be used more than once to exclude more than one thing.
 
+=item B<--> I<params>
+
+Pass "params" to L<dpkg-shlibdeps(1)>.
+
+=item B<-u>I<params>, B<--dpkg-shlibdeps-params=>I<params>
+
+This is another way to pass I<params> to L<dpkg-shlibdeps(1)>.
+It is deprecated; use B<--> instead.
+
 =item B<-l>I<directory>[:directory:directory:..]
 
 With recent versions of dpkg-shlibdeps, this option is generally not
@@ -82,10 +85,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 +115,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,7 +129,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