[Reproducible-builds] [debhelper] 19/33: Add perlapi-* dependency on packages installed to $Config{vendorarch}

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/reproducible_builds_fixmtimes
in repository debhelper.

commit 64cbd1fc0512228f8d4e3bdd3c7963dfc4de165f
Author: Niko Tyni <ntyni at debian.org>
Date:   Sat May 31 21:04:40 2014 +0300

    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.
---
 dh_perl | 8 ++++++--
 1 file 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/debhelper.git