This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository libxray-scattering-perl.
commit 2f88f467cdd1ebf8497ccea279403d540716cbf1 Author: gregor herrmann <[email protected]> Date: Sat Jul 25 20:16:01 2015 +0200 Imported Debian patch 3.0.1-1.1 --- debian/changelog | 14 ++++++++++++++ debian/control | 2 +- debian/patches/reproducible_db.patch | 26 ++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 5 +++-- 5 files changed, 45 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7582580..fe90e40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 <[email protected]> Sat, 25 Jul 2015 20:16:01 +0200 + libxray-scattering-perl (3.0.1-1) unstable; urgency=low * New upstream release diff --git a/debian/control b/debian/control index 869fe78..058e1ca 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: libxray-scattering-perl Section: perl Priority: optional Maintainer: Carlo Segre <[email protected]> -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 --git a/debian/patches/reproducible_db.patch b/debian/patches/reproducible_db.patch new file mode 100644 index 0000000..57d20e1 --- /dev/null +++ b/debian/patches/reproducible_db.patch @@ -0,0 +1,26 @@ +Author: Reiner Herrmann <[email protected]> +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 --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..4be9e98 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +reproducible_db.patch 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-scattering-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
