Control: tags 786634 + pending Control: tags 789633 + patch Control: tags 789633 + pending
Dear maintainer, I've prepared an NMU for libxray-scattering-perl (versioned as 3.0.1-1.1) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - https://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Tom Waits: Wrong Side Of The Road
diff -Nru libxray-scattering-perl-3.0.1/debian/changelog libxray-scattering-perl-3.0.1/debian/changelog
--- libxray-scattering-perl-3.0.1/debian/changelog 2011-07-31 00:57:23.000000000 +0200
+++ libxray-scattering-perl-3.0.1/debian/changelog 2015-07-25 20:16:04.000000000 +0200
@@ -1,3 +1,17 @@
+libxray-scattering-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: #789633)
+ * debian/rules: replace hardcoded /usr/lib/perl5 with value of
+ $Config{vendorarch}.
+ * Fix "please make the build reproducible":
+ add patch from Reiner Herrmann.
+ (Closes: #786634)
+
+ -- gregor herrmann <gre...@debian.org> Sat, 25 Jul 2015 20:16:01 +0200
+
libxray-scattering-perl (3.0.1-1) unstable; urgency=low
* New upstream release
diff -Nru libxray-scattering-perl-3.0.1/debian/control libxray-scattering-perl-3.0.1/debian/control
--- libxray-scattering-perl-3.0.1/debian/control 2011-07-31 00:56:30.000000000 +0200
+++ libxray-scattering-perl-3.0.1/debian/control 2015-07-25 20:12:21.000000000 +0200
@@ -2,7 +2,7 @@
Section: perl
Priority: optional
Maintainer: Carlo Segre <se...@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, libxray-absorption-perl
Standards-Version: 3.9.2
diff -Nru libxray-scattering-perl-3.0.1/debian/patches/reproducible_db.patch libxray-scattering-perl-3.0.1/debian/patches/reproducible_db.patch
--- libxray-scattering-perl-3.0.1/debian/patches/reproducible_db.patch 1970-01-01 01:00:00.000000000 +0100
+++ libxray-scattering-perl-3.0.1/debian/patches/reproducible_db.patch 2015-07-25 20:15:59.000000000 +0200
@@ -0,0 +1,26 @@
+Author: Reiner Herrmann <rei...@reiner-h.de>
+Description: Set $Storable::canonical to 1 to get reproducible output for nstore
+Bugs-Debian: https://bugs.debian.org/786634
+
+--- a/data/cromann.PL
++++ b/data/cromann.PL
+@@ -31,6 +31,8 @@
+ use File::Spec;
+ use Chemistry::Elements qw(get_symbol);
+
++$Storable::canonical = 1;
++
+ ##data (s(i),i=1,214) /
+ my @symbols = (
+ 'h', 'h.', 'h1-', 'he', 'li', 'li1+', 'be',
+--- a/data/waaskirf.PL
++++ b/data/waaskirf.PL
+@@ -36,6 +36,8 @@
+ use File::Spec;
+ use Chemistry::Elements qw(get_symbol);
+
++$Storable::canonical = 1;
++
+ ##data (s(i),i=1,214) /
+
+ my @symbols = qw(H H1- He Li Li1+ Be Be2+ B C Cval N O O1- O2- F F1- Ne Na
diff -Nru libxray-scattering-perl-3.0.1/debian/patches/series libxray-scattering-perl-3.0.1/debian/patches/series
--- libxray-scattering-perl-3.0.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ libxray-scattering-perl-3.0.1/debian/patches/series 2015-07-25 20:15:21.000000000 +0200
@@ -0,0 +1 @@
+reproducible_db.patch
diff -Nru libxray-scattering-perl-3.0.1/debian/rules libxray-scattering-perl-3.0.1/debian/rules
--- libxray-scattering-perl-3.0.1/debian/rules 2011-07-31 00:56:16.000000000 +0200
+++ libxray-scattering-perl-3.0.1/debian/rules 2015-07-25 20:13:18.000000000 +0200
@@ -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 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 $@
signature.asc
Description: Digital Signature
