summaryrefslogtreecommitdiff
path: root/dh_installdeb
diff options
context:
space:
mode:
authorNiels Thykier <niels@thykier.net>2015-01-07 21:52:45 +0100
committerNiels Thykier <niels@thykier.net>2015-03-28 10:04:19 +0100
commitad2042ad1a02eedc8d667a00d9a765e9c46f9c0b (patch)
treef5632a3931fc0432b679f4a8b62e1350a0251291 /dh_installdeb
parent063ea1adce9bc6f815a7aa34198e48eac9df36c3 (diff)
downloaddebhelper-ad2042ad1a02eedc8d667a00d9a765e9c46f9c0b.tar.gz
Let dh_makeshlibs install shlibs files (instead of dh_installdeb)
Signed-off-by: Niels Thykier <niels@thykier.net>
Diffstat (limited to 'dh_installdeb')
-rwxr-xr-xdh_installdeb8
1 files changed, 7 insertions, 1 deletions
diff --git a/dh_installdeb b/dh_installdeb
index 26c2b0c5..569b0a45 100755
--- a/dh_installdeb
+++ b/dh_installdeb
@@ -42,6 +42,9 @@ shell script snippets generated by other debhelper commands.
These control files are installed into the F<DEBIAN> directory.
+Note that I<package>.shlibs is only installed in compat level 9 and
+earlier. In compat 10, please use L<dh_makeshlibs(1)>.
+
=item I<package>.conffiles
This control file will be installed into the F<DEBIAN> directory.
@@ -117,7 +120,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
}
# Install non-executable files
- foreach my $file (qw{shlibs conffiles triggers}) {
+ my @non_exec_files = (qw{conffiles triggers});
+ # In compat 10, we let dh_makeshlibs handle "shlibs".
+ push(@non_exec_files, 'shlibs') if compat(9);
+ foreach my $file (@non_exec_files) {
my $f=pkgfile($package,$file);
if ($f) {
install_file($f, "$tmp/DEBIAN/$file");