summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiko Tyni <ntyni@debian.org>2014-05-31 21:04:40 +0300
committerJoey Hess <joey@kitenet.net>2014-06-30 10:00:56 -0400
commit64cbd1fc0512228f8d4e3bdd3c7963dfc4de165f (patch)
tree7c8218c3e16e14dd652586c9876b34b68777b8a6
parent811eb627b97a224d01be46c2b0771da8af1cc2ef (diff)
Add perlapi-* dependency on packages installed to $Config{vendorarch}
$Config{vendorarch} can now change between perl versions, so stricter dependencies are needed for partial upgrades. See #750017 for details. This currently affects six packages in the archive.
-rwxr-xr-xdh_perl8
1 files changed, 6 insertions, 2 deletions
diff --git a/dh_perl b/dh_perl
index ddea2cd..1a0876e 100755
--- a/dh_perl
+++ b/dh_perl
@@ -86,6 +86,7 @@ my $version;
use constant PROGRAM => 1;
use constant PM_MODULE => 2;
use constant XS_MODULE => 4;
+use constant ARCHDEP_MODULE => 8;
foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
@@ -101,6 +102,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
return unless -f;
$deps |= PM_MODULE if /\.pm$/;
$deps |= XS_MODULE if /\.so$/;
+ $deps |= ARCHDEP_MODULE
+ if $File::Find::dir =~ /\Q$vendorarch\E/;
}, @dirs if @dirs;
# find scripts
@@ -129,10 +132,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
addsubstvar($package, "perl:Depends", $perl, $version)
unless $perl eq 'perl-base' && ! length($version);
- # add perlapi-<ver> for XS modules
+ # add perlapi-<ver> for XS modules and other modules
+ # installed into vendorarch
addsubstvar($package, "perl:Depends",
"perlapi-" . ($Config{debian_abi} || $Config{version}))
- if $deps & XS_MODULE;
+ if $deps & ( XS_MODULE | ARCHDEP_MODULE );
}
# MakeMaker always makes lib and share dirs, but typically