[libtest-valgrind-perl] 01/04: Don't hardcode /usr/lib/perl5

[Salvatore Bonaccorso]

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

carnil pushed a commit to branch master
in repository libtest-valgrind-perl.

commit af2fe2df8d25da96491471dd7ca825c5472630e6
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Sat Jun 28 10:39:21 2014 +0200

    Don't hardcode /usr/lib/perl5
    
    Use vedorarch in preparation for multi-arch perl 5.20 transition.
    
    Add a Depends on perlapi (cf. #750017) as the package is using
    vendorarch.
    
    Closes: #752981
---
 debian/control |  1 +
 debian/rules   | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index fede2e9..af39b61 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Package: libtest-valgrind-perl
 Architecture: all
 Depends: ${misc:Depends},
          ${perl:Depends},
+         ${perlapi:Depends},
          libenv-sanctify-perl,
          libfile-homedir-perl,
          libperl-destruct-level-perl,
diff --git a/debian/rules b/debian/rules
index 6681f7b..6feb330 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,9 @@ PACKAGE   = $(shell dh_listpackages)
 TMP       = $(CURDIR)/debian/$(PACKAGE)
 BUILDHOME = $(CURDIR)/debian/build
 
+ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}')
+PERLAPI := $(shell perl -MConfig -e 'print ($$Config{debian_abi} || $$Config{version})')
+
 %:
 	dh $@
 
@@ -18,5 +21,8 @@ override_dh_clean:
 override_dh_auto_install:
 	dh_auto_install
 	mkdir --parents $(TMP)/usr/share/perl5/
-	mv -vf $(TMP)/usr/lib/perl5/* $(TMP)/usr/share/perl5/
-	[ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/lib/perl5
+	mv -vf $(TMP)$(ARCHLIB)/* $(TMP)/usr/share/perl5/
+	[ ! -d $(TMP)$(ARCHLIB) ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)$(ARCHLIB)
+
+override_dh_gencontrol:
+	dh_gencontrol -- -V'perlapi:Depends=perlapi-$(PERLAPI)'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libtest-valgrind-perl.git