[libwx-perl] 03/09: Drop encoding-pragma.patch, unescaped_left_brace.patch.

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libwx-perl.

commit d14c76849a0545c3f3f64a4c91392f7d45fa9862
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Jun 23 20:39:18 2017 +0200

    Drop encoding-pragma.patch, unescaped_left_brace.patch.
    
    Both fixed upstream.
---
 debian/patches/encoding-pragma.patch      | 20 --------------------
 debian/patches/series                     |  2 --
 debian/patches/unescaped_left_brace.patch | 19 -------------------
 3 files changed, 41 deletions(-)

diff --git a/debian/patches/encoding-pragma.patch b/debian/patches/encoding-pragma.patch
deleted file mode 100644
index 47e0082..0000000
--- a/debian/patches/encoding-pragma.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: comment out "use encoding"
- which is fatal in perl 5.25.x
-Origin: vendor
-Bug: https://rt.cpan.org/Ticket/Display.html?id=115097
-Bug-Debian: https://bugs.debian.org/826452
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2017-05-20
-Applied-Upstream: r3548, 0.9929
-
---- a/t/18_unicode.t
-+++ b/t/18_unicode.t
-@@ -5,7 +5,7 @@
- use lib './t';
- use Tests_Helper qw(in_frame);
- use Test::More 'tests' => 12;
--use encoding qw(iso-8859-1);
-+#use encoding qw(iso-8859-1);
- use Encode qw(is_utf8);
- 
- my $ascii   = 'Abcde';
diff --git a/debian/patches/series b/debian/patches/series
index cc7918a..8bbd329 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,5 +5,3 @@ fix-fake-pod.patch
 spelling.patch
 0001-Fix-Wx-_load_plugin-segfaulting-when-wxPluginManager.patch
 reproducible_output.patch
-unescaped_left_brace.patch
-encoding-pragma.patch
diff --git a/debian/patches/unescaped_left_brace.patch b/debian/patches/unescaped_left_brace.patch
deleted file mode 100644
index 48481c7..0000000
--- a/debian/patches/unescaped_left_brace.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: fix "Unescaped left brace" warning, which is fatal in 5.25.x
-Origin: vendor
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=115103
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826463
-Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=115103
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2017-05-20
-
---- a/build/Wx/build/Utils.pm
-+++ b/build/Wx/build/Utils.pm
-@@ -107,7 +107,7 @@
-     m/^\s*INCLUDE:\s+(.*)$/ and $file = $1 and $arr = \@xsinclude;
-     m/^\s*INCLUDE_COMMAND:\s+.*\s(\S+\.(?:xsp?|h))\s*/ and $file = $1 and
-       $arr = \@xsinclude;
--    m/^\s*\%include{([^}]+)}\s*;\s*$/ and $file = $1 and $arr = \@xsinclude;
-+    m/^\s*\%include\{([^}]+)}\s*;\s*$/ and $file = $1 and $arr = \@xsinclude;
- 
-     if( defined $file ) {
-       $file = catfile( split '/', $file );

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libwx-perl.git