diff options
author | Joey Hess <joey@kitenet.net> | 2007-11-29 12:25:32 -0500 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2007-11-29 12:25:32 -0500 |
commit | 98188af0f226355ecaff2c67d80bea055bdd59a9 (patch) | |
tree | 613f5f2a720f0636c8b8cb047b753fb5acdb4454 /dh_makeshlibs | |
parent | 6206746ec32b51b962da453ce4831312bae3bdfd (diff) | |
download | debhelper-98188af0f226355ecaff2c67d80bea055bdd59a9.tar.gz |
* dh_makeshlibs: Use new -I flag to specify symbol files, necessary to5.0.62
properly support includes. Closes: #452717
* Increase dpkg-dev dependency to 1.14.12 to ensure that dh_makeshlibs
isn't used with an old dpkg-gensymbols that doesn't support -I.
Diffstat (limited to 'dh_makeshlibs')
-rwxr-xr-x | dh_makeshlibs | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/dh_makeshlibs b/dh_makeshlibs index 7da87b32..642393d1 100755 --- 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 @@ -208,15 +207,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"); |