This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository libcpanplus-perl.
commit 8eff9e347020f378546ab863f54305b25662d731 Author: gregor herrmann <gre...@debian.org> Date: Sat Oct 8 16:01:17 2016 +0200 Add patch 0001-Fix-RT-116479-test-failure-with-v5.24.1-RC.patch from upstream Git for compatibility with Perl v5.24.1-RC*. The two .gz files are stripped from the original patch as quilt doesn't like binary diffs. They are applied directly and added to debian/source/include-binaries instead. This file can be removed once a new upstream release with this commit included is imported. Closes: #839200 --- ...ix-RT-116479-test-failure-with-v5.24.1-RC.patch | 55 +++++++++++++++++++++ debian/patches/series | 1 + debian/source/include-binaries | 2 + .../authors/id/EUNOXS/CPANPLUS-0.01.tar.gz | Bin 0 -> 119 bytes t/dummy-CPAN/modules/02packages.details.txt.gz | Bin 437 -> 451 bytes 5 files changed, 58 insertions(+) diff --git a/debian/patches/0001-Fix-RT-116479-test-failure-with-v5.24.1-RC.patch b/debian/patches/0001-Fix-RT-116479-test-failure-with-v5.24.1-RC.patch new file mode 100644 index 0000000..ca36714 --- /dev/null +++ b/debian/patches/0001-Fix-RT-116479-test-failure-with-v5.24.1-RC.patch @@ -0,0 +1,55 @@ +From fe39e473a39e00b0bc9448f0c77333bd7fa1a7c0 Mon Sep 17 00:00:00 2001 +From: Chris 'BinGOs' Williams <ch...@bingosnet.co.uk> +Date: Wed, 27 Jul 2016 20:10:44 +0100 +Subject: [PATCH] Fix RT#116479 test failure with v5.24.1-RC* + +Cwd in recently released perls is using tr/_// on $VERSION +which causes our test to fail. + +Fix: don't rely on things outside our control in the test + +Blame rjbs ultimately. + +Bug: https://rt.cpan.org/Public/Bug/Display.html?id=116479 +Bug-Debian: https://bugs.debian.org/839200 + +--- + MANIFEST | 1 + + t/40_CPANPLUS-Internals-Report.t | 6 +++--- + t/dummy-CPAN/authors/id/EUNOXS/CPANPLUS-0.01.tar.gz | Bin 0 -> 119 bytes + t/dummy-CPAN/modules/02packages.details.txt.gz | Bin 437 -> 451 bytes + 4 files changed, 4 insertions(+), 3 deletions(-) + create mode 100644 t/dummy-CPAN/authors/id/EUNOXS/CPANPLUS-0.01.tar.gz + +diff --git a/MANIFEST b/MANIFEST +index a83b96a..cba6eaa 100644 +--- a/MANIFEST ++++ b/MANIFEST +@@ -134,6 +134,7 @@ t/40_CPANPLUS-Internals-Report.t + t/dummy-CPAN/authors/01mailrc.txt.gz + t/dummy-CPAN/authors/id/EUNOXS/Bundle-Foo-Bar-0.01.tar.gz + t/dummy-CPAN/authors/id/EUNOXS/CHECKSUMS ++t/dummy-CPAN/authors/id/EUNOXS/CPANPLUS-0.01.tar.gz + t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.meta + t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.readme + t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.tar.gz +diff --git a/t/40_CPANPLUS-Internals-Report.t b/t/40_CPANPLUS-Internals-Report.t +index a882335..6a5fc8d 100644 +--- a/t/40_CPANPLUS-Internals-Report.t ++++ b/t/40_CPANPLUS-Internals-Report.t +@@ -310,9 +310,9 @@ my $map = { + my $str = REPORT_TOOLCHAIN_VERSIONS->( $clone ); + + like($str, qr/toolchain/, "Correct message in report" ); +- use Cwd; +- like($str, qr/Cwd\s+\Q$Cwd::VERSION\E/, +- "Cwd has correct version in report" ); ++ use CPANPLUS; ++ like($str, qr/CPANPLUS\s+\Q$CPANPLUS::VERSION\E/, ++ "CPANPLUS has correct version in report" ); + } + } + +-- +2.9.3 + diff --git a/debian/patches/series b/debian/patches/series index 2ad8eed..cddc0d4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ cpanplus_config_path.diff cpanplus_definstalldirs.diff spelling.patch +0001-Fix-RT-116479-test-failure-with-v5.24.1-RC.patch diff --git a/debian/source/include-binaries b/debian/source/include-binaries new file mode 100644 index 0000000..6c2fffc --- /dev/null +++ b/debian/source/include-binaries @@ -0,0 +1,2 @@ +t/dummy-CPAN/authors/id/EUNOXS/CPANPLUS-0.01.tar.gz +t/dummy-CPAN/modules/02packages.details.txt.gz diff --git a/t/dummy-CPAN/authors/id/EUNOXS/CPANPLUS-0.01.tar.gz b/t/dummy-CPAN/authors/id/EUNOXS/CPANPLUS-0.01.tar.gz new file mode 100644 index 0000000..1d1e081 Binary files /dev/null and b/t/dummy-CPAN/authors/id/EUNOXS/CPANPLUS-0.01.tar.gz differ diff --git a/t/dummy-CPAN/modules/02packages.details.txt.gz b/t/dummy-CPAN/modules/02packages.details.txt.gz index ec0f69d..f52ed6b 100644 Binary files a/t/dummy-CPAN/modules/02packages.details.txt.gz and b/t/dummy-CPAN/modules/02packages.details.txt.gz differ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libcpanplus-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits