diff -Nru libmarpa-r2-perl-2.086000~dfsg/debian/changelog libmarpa-r2-perl-2.086000~dfsg/debian/changelog --- libmarpa-r2-perl-2.086000~dfsg/debian/changelog 2020-11-09 11:44:11.000000000 +0000 +++ libmarpa-r2-perl-2.086000~dfsg/debian/changelog 2021-01-22 11:20:47.000000000 +0000 @@ -1,32 +1,36 @@ -libmarpa-r2-perl (2.086000~dfsg-6build5) hirsute; urgency=medium +libmarpa-r2-perl (2.086000~dfsg-7) unstable; urgency=medium - * No-change rebuild for the perl update. + * Team upload. - -- Matthias Klose Mon, 09 Nov 2020 12:44:11 +0100 + [ intrigeri ] + * reproducible_build.patch: fix buggy behaviour when SOURCE_DATE_EPOCH + is not set. + + [ Salvatore Bonaccorso ] + * Update Vcs-* headers for switch to salsa.debian.org + + [ gregor herrmann ] + * debian/*: update URLs from {search,www}.cpan.org to MetaCPAN. + * debian/*: update GitHub URLs to use HTTPS. + + [ Debian Janitor ] + * Use secure copyright file specification URI. + * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, + Repository-Browse. + * Bump debhelper dependency to >= 8, since that's what is used in + debian/compat. + * Bump debhelper from deprecated 8 to 10. + + [ gregor herrmann ] + * debian/control: drop unused devscripts dependency. + * Drop unneeded version constraints and alternatives from build + dependencies. + * Update Build-Depends for cross builds. + * Annotate test-only build dependencies with . + * All of the above based on a patch by Helmut Grohne, thanks. + Closes: #980529 -libmarpa-r2-perl (2.086000~dfsg-6build4) focal; urgency=medium - - * No-change rebuild for the perl update. - - -- Matthias Klose Sat, 19 Oct 2019 08:04:08 +0000 - -libmarpa-r2-perl (2.086000~dfsg-6build3) disco; urgency=medium - - * No-change rebuild for the perl 5.28 transition. - - -- Adam Conrad Fri, 02 Nov 2018 19:46:49 -0600 - -libmarpa-r2-perl (2.086000~dfsg-6build2) artful; urgency=medium - - * No-change rebuild for perl 5.26.0. - - -- Matthias Klose Wed, 26 Jul 2017 20:28:10 +0000 - -libmarpa-r2-perl (2.086000~dfsg-6build1) zesty; urgency=medium - - * No-change rebuild for perl 5.24 transition - - -- Iain Lane Mon, 24 Oct 2016 17:07:52 +0100 + -- gregor herrmann Fri, 22 Jan 2021 12:20:47 +0100 libmarpa-r2-perl (2.086000~dfsg-6) unstable; urgency=medium diff -Nru libmarpa-r2-perl-2.086000~dfsg/debian/compat libmarpa-r2-perl-2.086000~dfsg/debian/compat --- libmarpa-r2-perl-2.086000~dfsg/debian/compat 2016-06-26 17:52:59.000000000 +0000 +++ libmarpa-r2-perl-2.086000~dfsg/debian/compat 2021-01-22 11:20:47.000000000 +0000 @@ -1 +1 @@ -8 +10 diff -Nru libmarpa-r2-perl-2.086000~dfsg/debian/control libmarpa-r2-perl-2.086000~dfsg/debian/control --- libmarpa-r2-perl-2.086000~dfsg/debian/control 2016-06-26 17:52:59.000000000 +0000 +++ libmarpa-r2-perl-2.086000~dfsg/debian/control 2021-01-22 11:20:47.000000000 +0000 @@ -4,25 +4,25 @@ Section: perl Testsuite: autopkgtest-pkg-perl Priority: optional -Build-Depends: cdbs (>= 0.4.123~), - autotools-dev, - devscripts, - libtool, +Build-Depends: autoconf, automake, - autoconf, - debhelper, + autotools-dev, + cdbs, + debhelper (>= 10~), dh-buildinfo, - perl (>= 5.17.1) | libcpan-meta-perl (>= 2.120921), - libconfig-autoconf-perl (>= 0.22), - perl (>= 5.11.2) | libextutils-cbuilder-perl, - libmodule-build-perl (>= 0.400300), - perl (>= 5.11), - libhtml-parser-perl (>= 3.69), - perl (>= 5.11.1) | libtest-simple-perl (>= 0.94), - libppi-perl + libconfig-autoconf-perl, + libcpan-meta-perl , + libextutils-cbuilder-perl, + libhtml-parser-perl , + libmodule-build-perl, + libppi-perl , + libtest-simple-perl , + libtool, + perl-xs-dev, + perl:native Standards-Version: 3.9.6 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libmarpa-r2-perl.git -Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libmarpa-r2-perl +Vcs-Browser: https://salsa.debian.org/perl-team/modules/packages/libmarpa-r2-perl +Vcs-Git: https://salsa.debian.org/perl-team/modules/packages/libmarpa-r2-perl.git Homepage: https://metacpan.org/release/Marpa-R2 Package: libmarpa-r2-perl diff -Nru libmarpa-r2-perl-2.086000~dfsg/debian/control.in libmarpa-r2-perl-2.086000~dfsg/debian/control.in --- libmarpa-r2-perl-2.086000~dfsg/debian/control.in 2016-06-26 17:52:59.000000000 +0000 +++ libmarpa-r2-perl-2.086000~dfsg/debian/control.in 2021-01-22 11:20:47.000000000 +0000 @@ -1,7 +1,7 @@ Source: libmarpa-r2-perl Section: perl Priority: optional -Build-Depends: @cdbs@ +Build-Depends: @cdbs@, debhelper (>= 10~) Maintainer: Debian Perl Group Uploaders: Jonas Smedegaard Standards-Version: 3.9.5 diff -Nru libmarpa-r2-perl-2.086000~dfsg/debian/copyright libmarpa-r2-perl-2.086000~dfsg/debian/copyright --- libmarpa-r2-perl-2.086000~dfsg/debian/copyright 2016-06-26 17:52:59.000000000 +0000 +++ libmarpa-r2-perl-2.086000~dfsg/debian/copyright 2021-01-22 11:20:47.000000000 +0000 @@ -1,8 +1,8 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Marpa::R2 Upstream-Contact: http://rt.cpan.org/Dist/Display.html?Queue=Marpa-R2 -Source: http://search.cpan.org/dist/Marpa-R2/ - git://github.com/jeffreykegler/Marpa--R2.git +Source: https://metacpan.org/release/Marpa-R2 + https://github.com/jeffreykegler/Marpa--R2.git Repackaged, excluding non-DFSG file Files-Excluded: t/etc/wall_proof.txt diff -Nru libmarpa-r2-perl-2.086000~dfsg/debian/patches/auto-gitignore libmarpa-r2-perl-2.086000~dfsg/debian/patches/auto-gitignore --- libmarpa-r2-perl-2.086000~dfsg/debian/patches/auto-gitignore 1970-01-01 00:00:00.000000000 +0000 +++ libmarpa-r2-perl-2.086000~dfsg/debian/patches/auto-gitignore 2021-01-22 11:20:47.000000000 +0000 @@ -0,0 +1,239 @@ +Subject: Update .gitignore from Debian packaging branch + +The Debian packaging git branch contains these updates to the upstream +.gitignore file(s). This patch is autogenerated, to provide these +updates to users of the official Debian archive view of the package. + +[dgit (9.12) update-gitignore] +--- +diff --git a/.gitignore b/.gitignore +index 535768d09..b408e6cd2 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -1,26 +1 @@ +-.gdb_history +-/Build +-/META.json +-/META.yml +-/MYMETA.json +-/MYMETA.yml +-/Makefile +-/Marpa-R2-[0-9].[0-9][0-9][0-9][0-9][0-9][0-9].tar.gz +-/Marpa-R2-[0-9].[0-9][0-9][0-9][0-9][0-9][0-9]/ +-/Marpa-R2-[0-9].[0-9][0-9][0-9]_[0-9][0-9][0-9].tar.gz +-/Marpa-R2-[0-9].[0-9][0-9][0-9]_[0-9][0-9][0-9]/ +-/_build/ +-/blib/ +-/blib_shared/ +-/libmarpa_build/ +-/libmarpa_shared/ +-/libmarpa_dist/ +-/libmarpa_doc_dist/ +-/hide/ +-/pod2htmd.tmp +-/pod2htmi.tmp +-[.]DS_Store +-errs +-junk +-nogit* +-dovg.log ++/.pc +diff --git a/author.t/.gitignore b/author.t/.gitignore +deleted file mode 100644 +index 1e8c893c4..000000000 +--- a/author.t/.gitignore ++++ /dev/null +@@ -1,5 +0,0 @@ +-all.errs +-critic.errs +-critic.list +-display.errs +-tidy.errs +diff --git a/etc/.gitignore b/etc/.gitignore +deleted file mode 100644 +index 0bacac25d..000000000 +--- a/etc/.gitignore ++++ /dev/null +@@ -1 +0,0 @@ +-/errs +diff --git a/html/.gitignore b/html/.gitignore +deleted file mode 100644 +index 065230544..000000000 +--- a/html/.gitignore ++++ /dev/null +@@ -1,15 +0,0 @@ +-/Build +-/MYMETA[.]json +-/MYMETA[.]yml +-/Makefile +-/Marpa-HTML-[0-9].[0-9][0-9][0-9][0-9][0-9][0-9].tar.gz +-/Marpa-HTML-[0-9].[0-9][0-9][0-9][0-9][0-9][0-9]/ +-/Marpa-HTML-[0-9].[0-9][0-9][0-9]_[0-9][0-9][0-9].tar.gz +-/Marpa-HTML-[0-9].[0-9][0-9][0-9]_[0-9][0-9][0-9]/ +-/_build/ +-/blib/ +-/inc/save +-/pod2htmd.tmp +-/pod2htmi.tmp +-/save/ +-/save/lib/ +diff --git a/html/lib/Marpa/R2/HTML/.gitignore b/html/lib/Marpa/R2/HTML/.gitignore +deleted file mode 100644 +index a33319ff6..000000000 +--- a/html/lib/Marpa/R2/HTML/.gitignore ++++ /dev/null +@@ -1 +0,0 @@ +-Version[.]pm +diff --git a/lib/Marpa/.gitignore b/lib/Marpa/.gitignore +deleted file mode 100644 +index d1627c1b9..000000000 +--- a/lib/Marpa/.gitignore ++++ /dev/null +@@ -1,4 +0,0 @@ +-R2.c +-R2.o +-R2.xs +-general_pattern.xsh +diff --git a/lib/Marpa/R2/.gitignore b/lib/Marpa/R2/.gitignore +deleted file mode 100644 +index 28e39c0fb..000000000 +--- a/lib/Marpa/R2/.gitignore ++++ /dev/null +@@ -1,2 +0,0 @@ +-/Version[.]pm +-/Installed[.]pm +diff --git a/libmarpa/.gitignore b/libmarpa/.gitignore +deleted file mode 100644 +index ac18c0c89..000000000 +--- a/libmarpa/.gitignore ++++ /dev/null +@@ -1,4 +0,0 @@ +-stage/ +-doc/ +-libmarpa.tar +-libmarpa-doc.tar +diff --git a/libmarpa/ami/.gitignore b/libmarpa/ami/.gitignore +deleted file mode 100644 +index 3cdf8df3e..000000000 +--- a/libmarpa/ami/.gitignore ++++ /dev/null +@@ -1,14 +0,0 @@ +-/copyright_page_license[.]w +-/cwebmac[.]tex +-/marpa_ami[.]c +-/marpa_ami[.]c[.]p[0-9][0-9] +-/marpa_ami[.]h +-/marpa_ami[.]h[.]p[0-9][0-9] +-/marpa_ami[.]idx +-/marpa_ami[.]log +-/marpa_ami[.]pdf +-/marpa_ami[.]scn +-/marpa_ami[.]tex +-/marpa_ami[.]toc +-/ami_private[.]h +-/*[.]swp +diff --git a/libmarpa/dev/.gitignore b/libmarpa/dev/.gitignore +deleted file mode 100644 +index b33ae6c66..000000000 +--- a/libmarpa/dev/.gitignore ++++ /dev/null +@@ -1,24 +0,0 @@ +-/api[.]texi[~] +-/cwebmac[.]tex +-/internal[.]texi[~] +-/marpa[.]c +-/marpa[.]c[.]p10 +-/marpa[.]c[.]p40 +-/marpa[.]c[.]p50 +-/marpa[.]def +-/marpa[.]h[.]p50 +-/marpa[.]h[.]p80 +-/marpa[.]idx +-/marpa[.]log +-/marpa[.]pdf +-/marpa[.]scn +-/marpa[.]tex +-/marpa[.]toc +-/legacy[.]idx +-/legacy[.]log +-/legacy[.]pdf +-/legacy[.]scn +-/legacy[.]tex +-/legacy[.]toc +-/private[.]h +-/*[.]swp +diff --git a/libmarpa/public/.gitignore b/libmarpa/public/.gitignore +deleted file mode 100644 +index 39ab9e4a9..000000000 +--- a/libmarpa/public/.gitignore ++++ /dev/null +@@ -1,14 +0,0 @@ +-/marpa[.]h-err +-/marpa[.]c-err +-/marpa[.]c-event +-/marpa[.]c-step +-/marpa[.]h-event +-/marpa[.]h-step +-/marpa_codes[.]c +-/marpa[.]h +-/marpa_slif[.]h +-/marpa[.]h[.]p50 +-/marpa_slif[.]h[.]p50 +-/marpa_slif[.]h[.]p80 +-/marpa_slif[.]h-ops +-/marpa[.]h[.]p80 +diff --git a/libmarpa/slif/.gitignore b/libmarpa/slif/.gitignore +deleted file mode 100644 +index 756a96a2c..000000000 +--- a/libmarpa/slif/.gitignore ++++ /dev/null +@@ -1,14 +0,0 @@ +-/cwebmac[.]tex +-/marpa_slif[.]c +-/marpa_slif[.]c[.]p[0-9][0-9] +-/marpa_slif[.]c-ops +-/marpa_slif[.]h +-/marpa_slif[.]h[.]p[0-9][0-9] +-/marpa_slif[.]h-ops +-/marpa_slif[.]idx +-/marpa_slif[.]log +-/marpa_slif[.]pdf +-/marpa_slif[.]scn +-/marpa_slif[.]tex +-/marpa_slif[.]toc +-/*[.]swp +diff --git a/libmarpa/tavl/.gitignore b/libmarpa/tavl/.gitignore +deleted file mode 100644 +index 6f156a564..000000000 +--- a/libmarpa/tavl/.gitignore ++++ /dev/null +@@ -1,4 +0,0 @@ +-tavl-test +-tavl-test[.]o +-tavl[.]o +-test[.]o +diff --git a/pperl/Marpa/R2/Perl/.gitignore b/pperl/Marpa/R2/Perl/.gitignore +deleted file mode 100644 +index 5d50f9d39..000000000 +--- a/pperl/Marpa/R2/Perl/.gitignore ++++ /dev/null +@@ -1,2 +0,0 @@ +-/Installed[.]pm +-/Version[.]pm +diff --git a/t/.gitignore b/t/.gitignore +deleted file mode 100644 +index a94193101..000000000 +--- a/t/.gitignore ++++ /dev/null +@@ -1 +0,0 @@ +-junk +diff --git a/xs/.gitignore b/xs/.gitignore +deleted file mode 100644 +index e4c683954..000000000 +--- a/xs/.gitignore ++++ /dev/null +@@ -1,4 +0,0 @@ +-libmarpa[.]a +-libmarpa_la-marpa[.]o +-libmarpa_la-marpa_obs[.]o +-general_pattern.xsh diff -Nru libmarpa-r2-perl-2.086000~dfsg/debian/patches/reproducible_build.patch libmarpa-r2-perl-2.086000~dfsg/debian/patches/reproducible_build.patch --- libmarpa-r2-perl-2.086000~dfsg/debian/patches/reproducible_build.patch 2016-06-26 17:52:59.000000000 +0000 +++ libmarpa-r2-perl-2.086000~dfsg/debian/patches/reproducible_build.patch 2021-01-22 11:20:47.000000000 +0000 @@ -1,5 +1,14 @@ Author: Reiner Herrmann -Description: Honour SOURCE_DATE_EPOCH for embedded timestamp, if it is set +Description: Honour SOURCE_DATE_EPOCH for embedded timestamp + When the environment variable SOURCE_DATE_EPOCH is set, use it instead of the + current time for the embedded build timestamp. + . + The specification of SOURCE_DATE_EPOCH is available here: + https://reproducible-builds.org/specs/source-date-epoch/ + . + In the case it is not defined, fall back to current time in UTC. +Forwarded: https://rt.cpan.org/Ticket/Display.html?id=115614 +Bug: https://rt.cpan.org/Ticket/Display.html?id=115614 --- a/inc/Marpa/R2/Build_Me.pm +++ b/inc/Marpa/R2/Build_Me.pm @@ -8,7 +17,7 @@ ##no critic(ValuesAndExpressions::RequireInterpolationOfMetachars) $text .= q{use vars qw($TIMESTAMP)} . qq{;\n}; - $text .= q{$TIMESTAMP='} . localtime()->datetime . qq{';\n}; -+ $text .= q{$TIMESTAMP='} . (gmtime($ENV{SOURCE_DATE_EPOCH}) || localtime())->datetime . qq{';\n}; ++ $text .= q{$TIMESTAMP='} . (gmtime($ENV{SOURCE_DATE_EPOCH} || time()))->datetime . qq{';\n}; ##use critic for my $package (@use_packages) { @@ -17,7 +26,7 @@ ##no critic(ValuesAndExpressions::RequireInterpolationOfMetachars) $text .= q{use vars qw($TIMESTAMP)} . qq{;\n}; - $text .= q{$TIMESTAMP='} . localtime()->datetime . qq{';\n}; -+ $text .= q{$TIMESTAMP='} . (gmtime($ENV{SOURCE_DATE_EPOCH}) || localtime())->datetime . qq{';\n}; ++ $text .= q{$TIMESTAMP='} . (gmtime($ENV{SOURCE_DATE_EPOCH} || time()))->datetime . qq{';\n}; ##use critic for my $package (@use_packages) { diff -Nru libmarpa-r2-perl-2.086000~dfsg/debian/patches/series libmarpa-r2-perl-2.086000~dfsg/debian/patches/series --- libmarpa-r2-perl-2.086000~dfsg/debian/patches/series 2016-06-26 17:52:59.000000000 +0000 +++ libmarpa-r2-perl-2.086000~dfsg/debian/patches/series 2021-01-22 11:20:47.000000000 +0000 @@ -1,3 +1,4 @@ 1001_xs_boot_workaround.patch 2001_libmarpa_external_linkage.patch reproducible_build.patch +auto-gitignore diff -Nru libmarpa-r2-perl-2.086000~dfsg/debian/rules libmarpa-r2-perl-2.086000~dfsg/debian/rules --- libmarpa-r2-perl-2.086000~dfsg/debian/rules 2016-06-26 17:52:59.000000000 +0000 +++ libmarpa-r2-perl-2.086000~dfsg/debian/rules 2021-01-22 11:20:47.000000000 +0000 @@ -36,18 +36,17 @@ ./t/etc/wall_proof.txt # needed by upstream build -bdeps = perl (>= 5.17.1) | libcpan-meta-perl (>= 2.120921) -bdeps +=, libconfig-autoconf-perl (>= 0.22) -bdeps +=, perl (>= 5.11.2) | libextutils-cbuilder-perl -bdeps +=, perl (>= 5.17.3) | libmodule-build-perl (>= 0.400300) +bdeps = libcpan-meta-perl +bdeps +=, libconfig-autoconf-perl +bdeps +=, libextutils-cbuilder-perl +bdeps +=, libmodule-build-perl # needed by upstream build and (always) at runtime -# * perl 5.11 needed for Data::Dumper 2.125 (not packaged separately) -deps +=, perl (>= 5.11) -deps +=, libhtml-parser-perl (>= 3.69) +deps +=, perl +deps +=, libhtml-parser-perl # Needed (always/optionally) by upstream testsuite -deps-test = perl (>= 5.11.1) | libtest-simple-perl (>= 0.94) +deps-test = libtest-simple-perl deps-test-opt = libppi-perl CDBS_BUILD_DEPENDS +=, $(bdeps), $(deps), $(deps-test), $(deps-test-opt) diff -Nru libmarpa-r2-perl-2.086000~dfsg/debian/upstream/metadata libmarpa-r2-perl-2.086000~dfsg/debian/upstream/metadata --- libmarpa-r2-perl-2.086000~dfsg/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ libmarpa-r2-perl-2.086000~dfsg/debian/upstream/metadata 2021-01-22 11:20:47.000000000 +0000 @@ -0,0 +1,5 @@ +--- +Bug-Database: https://github.com/jeffreykegler/Marpa--R2/issues +Bug-Submit: https://github.com/jeffreykegler/Marpa--R2/issues/new +Repository: https://github.com/jeffreykegler/Marpa--R2.git +Repository-Browse: https://github.com/jeffreykegler/Marpa--R2 diff -Nru libmarpa-r2-perl-2.086000~dfsg/debian/watch libmarpa-r2-perl-2.086000~dfsg/debian/watch --- libmarpa-r2-perl-2.086000~dfsg/debian/watch 2016-06-26 17:52:59.000000000 +0000 +++ libmarpa-r2-perl-2.086000~dfsg/debian/watch 2021-01-22 11:20:47.000000000 +0000 @@ -1,6 +1,6 @@ # Run the "uscan" command to check for upstream updates and more. version=3 opts=dversionmangle=s/\~dfsg.*// \ -http://www.cpan.org/authors/id/J/JK/JKEGL/Marpa-R2-([\d.]+)\.tar\.gz +https://cpan.metacpan.org/authors/id/J/JK/JKEGL/Marpa-R2-([\d.]+)\.tar\.gz opts=dversionmangle=s/\~dfsg.*// \ https://metacpan.org/release/Marpa-R2 .*/Marpa-R2-([\d.]+)\.tar\.gz