dh_makeshlibs: Fix --add-udeb, for real. Closes: #518706

[debhelper.git] / dh_makeshlibs

diff --git a/dh_makeshlibs b/dh_makeshlibs
index 7da87b32e46ff8bae5299d9a6808fbfdec1ce2ff..776e66f0b8b5f229259d87cb6a5d6ce0c1e0ec03 100755 (executable)
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -23,8 +23,7 @@ V3 mode and above only) to any packages in which it finds shared libraries.
 
 If a L<dpkg-gensymbols(1)> symbol file is found in debian/package.symbols
 (or debian/package.symbols.arch), dpkg-gensymbols will be called
-to process and install the symbols file. Packages using symbols files
-should Build-Depend on dpkg-dev (>= 1.14.8).
+to process and install the symbols file.
 
 =head1 OPTIONS
 
@@ -105,7 +104,12 @@ Generates a shlibs file that looks something like:
 
 =cut
 
-init();
+init(options => {
+       "m=s", => \$dh{M_PARAMS},
+       "major=s" => \$dh{M_PARAMS},
+       "version-info:s" => \$dh{V_FLAG},
+       "add-udeb=s" => \$dh{SHLIBS_UDEB},
+});
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
        next if is_udeb($package);
@@ -208,15 +212,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        # dpkg-gensymbols files
        my $symbols=pkgfile($package, "symbols");
        if (-e $symbols) {
-               # This is done rather than using dpkg-gensymbols
+               # -I is used rather than using dpkg-gensymbols
                # own search for symbols files, since that search
                # is not 100% compatible with debhelper. (For example,
                # this supports --ignore being used.)
-               if (! -d "$tmp/DEBIAN") {
-                       doit("install","-d","$tmp/DEBIAN");
-               }
-               doit("cp", $symbols, "$tmp/DEBIAN/symbols");
-               doit("dpkg-gensymbols", "-p$package", "-O$tmp/DEBIAN/symbols",
+               doit("dpkg-gensymbols", "-p$package", "-I$symbols",
                        "-P$tmp", @{$dh{U_PARAMS}});
                if (-s "$tmp/DEBIAN/symbols" == 0) {
                        doit("rm", "-f", "$tmp/DEBIAN/symbols");