[libxray-spacegroup-perl] 03/15: Imported Debian patch 0.1.1-2.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-spacegroup-perl.

commit 53ff481048918ca026780d39d3d80eb2ab3b954b
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Jul 25 20:26:09 2015 +0200

    Imported Debian patch 0.1.1-2.1
---
 debian/changelog                  | 17 +++++++++++++++++
 debian/control                    |  6 +++---
 debian/patches/reproducible_build | 10 ++++++++++
 debian/patches/series             |  1 +
 debian/rules                      |  5 +++--
 5 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c724e2e..3db8a21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+libxray-spacegroup-perl (0.1.1-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "FTBFS with perl 5.22 (Module::Build)":
+    add libmodule-build-perl to Build-Depends.
+    (Closes: #789634)
+  * Replace hardcoded /usr/lib/perl5 with value of $Config{vendorarch} in
+    debian/rules.
+  * Remove perl-modules from Build-Depends-Indep and Depends.
+    This was just an implementation detail of src:perl, and will be gone in
+    5.22.
+  * Fix "please make the build reproducible":
+    add patch from Chris Lamb.
+    (Closes: #790072)
+
+ -- gregor herrmann <gregoa at debian.org>  Sat, 25 Jul 2015 20:26:09 +0200
+
 libxray-spacegroup-perl (0.1.1-2) unstable; urgency=low
 
   * Upgrade to Source-Format 3.0 (quilt) & remove quilt Build-Dep
diff --git a/debian/control b/debian/control
index effc610..7b08f64 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: libxray-spacegroup-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: perl (>= 5.8.8), perl-modules, libreadonly-perl,
+Build-Depends: debhelper (>= 7), libmodule-build-perl
+Build-Depends-Indep: perl (>= 5.8.8), libreadonly-perl,
 	libregexp-optimizer-perl, liblist-moreutils-perl, libclass-std-perl
 Maintainer: Carlo Segre <segre at debian.org>
 Standards-Version: 3.9.2
@@ -10,7 +10,7 @@ Homepage: http://cars9.uchicago.edu/~ravel/software/
 
 Package: libxray-spacegroup-perl
 Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, perl-modules, libreadonly-perl,
+Depends: ${perl:Depends}, ${misc:Depends}, libreadonly-perl,
 	libregexp-optimizer-perl, liblist-moreutils-perl, libclass-std-perl
 Homepage: http://cars9.uchicago.edu/~ravel/software/
 Description: symmetry operations for the crystal space groups
diff --git a/debian/patches/reproducible_build b/debian/patches/reproducible_build
new file mode 100644
index 0000000..6422301
--- /dev/null
+++ b/debian/patches/reproducible_build
@@ -0,0 +1,10 @@
+--- a/data/space_groups.db.PL
++++ b/data/space_groups.db.PL
+@@ -63,6 +63,7 @@
+ use File::Spec;
+ ##Storable:
+ use Storable qw/nstore/;
++$Storable::canonical = 1;
+ ##end Storable:
+ ##MLDBM:
+ ## use MLDBM qw(DB_File Storable);
diff --git a/debian/patches/series b/debian/patches/series
index 0e3c44b..66d6d92 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 modify-test-script
+reproducible_build
diff --git a/debian/rules b/debian/rules
index 5505f74..0649360 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
@@ -49,10 +50,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-spacegroup-perl.git