[libxray-absorption-perl] 04/16: Imported Debian patch 3.0.1-1.1

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository libxray-absorption-perl.

commit fa16bf0e2fa668c15dea3cd1aab024a1f190d540
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Jul 25 20:04:39 2015 +0200

    Imported Debian patch 3.0.1-1.1
---
 debian/changelog | 11 +++++++++++
 debian/control   |  2 +-
 debian/rules     |  5 +++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f061710..73ea8c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libxray-absorption-perl (3.0.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "FTBFS with perl 5.22 (Module::Build)":
+    add libmodule-build-perl to Build-Depends.
+    (Closes: #789632)
+  * debian/rules: replace hardcoded /usr/lib/perl5 with value of
+    $Config{vendorarch}.
+
+ -- gregor herrmann <gregoa at debian.org>  Sat, 25 Jul 2015 20:04:39 +0200
+
 libxray-absorption-perl (3.0.1-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index b4f29b2..d9460e2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libxray-absorption-perl
 Section: perl
 Priority: optional
 Maintainer: Carlo Segre <segre at debian.org>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7), libmodule-build-perl
 Build-Depends-Indep: perl (>= 5.8.8), libchemistry-elements-perl,
 	libmath-spline-perl, libstorable-perl, libstatistics-descriptive-perl,
 	libreadonly-perl
diff --git a/debian/rules b/debian/rules
index 4a6ed59..c63b432 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,7 @@
 export PERL_MM_USE_DEFAULT=1
 
 PACKAGE=$(shell dh_listpackages)
+ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}')
 
 ifndef PERL
 PERL = /usr/bin/perl
@@ -50,10 +51,10 @@ install-stamp: build-stamp
 	# Install package in temporary directory
 	./Build install --installdirs vendor
 	# remove .packlist
-	rm -rf $(TMP)/usr/lib/perl5/auto
+	rm -rf $(TMP)/$(ARCHLIB)/auto
 	# remove empty dirs if they exist
 	[ ! -d $(TMP)/usr/bin ] || rmdir --parents --ignore-fail-on-non-empty --verbose $(TMP)/usr/bin
-	[ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --parents --ignore-fail-on-non-empty --verbose $(TMP)/usr/lib/perl5
+	[ ! -d $(TMP)/$(ARCHLIB) ] || rmdir --parents --ignore-fail-on-non-empty --verbose $(TMP)/$(ARCHLIB)
 
 	touch $@
 

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