This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository libparse-errorstring-perl-perl.
commit 44f78ed627963764ded3c29ff137bf5cfc9e37b5
Author: gregor herrmann <gre...@debian.org>
Date: Wed Dec 2 21:16:48 2015 +0100
Drop adjust-to-perl-5.22.patch
which was taken from an upstream pull request.
---
debian/patches/adjust-to-perl-5.22.patch | 96 --------------------------------
debian/patches/series | 1 -
2 files changed, 97 deletions(-)
diff --git a/debian/patches/adjust-to-perl-5.22.patch
b/debian/patches/adjust-to-perl-5.22.patch
deleted file mode 100644
index cc1f8f8..0000000
--- a/debian/patches/adjust-to-perl-5.22.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From ecbaef9c24c50279ad0d9f96927f623998aa8555 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
-Date: Wed, 17 Jun 2015 14:09:37 +0200
-Subject: [PATCH] Adjust to perl-5.22
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Perl 5.22 changed diagnostic message about undeclard variable with
-this ond other commits:
-
-commit 68567d271d7bcc0392c9f9bdd834ad94db1e4773
-Author: Father Chrysostomos <spr...@cpan.org>
-Date: Thu Sep 18 22:10:14 2014 -0700
-
- Update perldiag to reflect ‘Global symbol’ change
-
- Why didn’t t/porting/diag.t catch this?
-
-This patch adujsts the test input and expected output to match perl 5.22
-wording.
-
-It's also fixes a bug when perldiag POD spanned the message to more
-lines which broke translation into regular expressions. The new-line
-character crept there.
-
-<https://github.com/PadreIDE/Parse-ErrorString-Perl/issues/1>
-
-Signed-off-by: Petr Písař <ppi...@redhat.com>
-
-Bugs-Debian: https://bugs.debian.org/789384
-
----
- lib/Parse/ErrorString/Perl.pm | 1 +
- t/04-perldiag.t | 29 +++++++++++++++++++++++++++--
- 2 files changed, 28 insertions(+), 2 deletions(-)
-
---- a/lib/Parse/ErrorString/Perl.pm
-+++ b/lib/Parse/ErrorString/Perl.pm
-@@ -93,6 +93,7 @@
- my %errors;
- foreach my $item ( $pom->head1->[1]->over->[0]->item ) {
- my $header = $item->title;
-+ $header =~ s/\n/ /g;
-
- my $content = $item->content;
- $content =~ s/\s*$//;
---- a/t/04-perldiag.t
-+++ b/t/04-perldiag.t
-@@ -13,11 +13,36 @@
- #
- # $hell;
-
--my $msg_compile = <<'ENDofMSG';
-+my $msg_compile;
-+
-+if ( $] < 5.021004 ) {
-+
-+ $msg_compile = <<'ENDofMSG';
- Global symbol "$kaboom" requires explicit package name at error.pl line 8.
- Execution of error.pl aborted due to compilation errors.
- ENDofMSG
-
-+} else {
-+
-+ $msg_compile = <<'ENDofMSG';
-+Global symbol "$kaboom" requires explicit package name (did you forget to
declare "my $kaboom"?) at error.pl line 8.
-+Execution of error.pl aborted due to compilation errors.
-+ENDofMSG
-+
-+}
-+
-+my $message;
-+
-+if ( $] < 5.021004 ) {
-+
-+ $message = q{Global symbol "$kaboom" requires explicit package name};
-+
-+} else {
-+
-+ $message = q{Global symbol "$kaboom" requires explicit package name (did
you forget to declare "my $kaboom"?)};
-+
-+}
-+
- my $diagnostics;
-
- if ( $] < 5.008009 ) {
-@@ -56,7 +81,7 @@
-
- my $parser = Parse::ErrorString::Perl->new;
- my @errors_compile = $parser->parse_string($msg_compile);
--is( $errors_compile[0]->message, 'Global symbol "$kaboom" requires explicit
package name', 'message' );
-+is( $errors_compile[0]->message, $message, 'message' );
-
- #ok($errors_compile[0]->diagnostics eq $diagnostics, 'diagnostics');
- my $obtained_diagnostics = $errors_compile[0]->diagnostics;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4d3ae27..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-adjust-to-perl-5.22.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/libparse-errorstring-perl-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
