[libperl5i-perl] 05/07: Drop debian/patches/fix-utf8-in-argv-handling

[Axel Beckert]

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

abe pushed a commit to branch master
in repository libperl5i-perl.

commit 36f517cff738b7457fa6a0442cf88a992e665015
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Fri Apr 10 23:13:07 2015 +0200

    Drop debian/patches/fix-utf8-in-argv-handling
    
    It was cherry-picked from upstream
---
 debian/changelog                         |  2 ++
 debian/patches/fix-utf8-in-argv-handling | 20 --------------------
 debian/patches/series                    |  1 -
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 84e27f2..a26f457 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ libperl5i-perl (2.13.1-1) UNRELEASED; urgency=medium
 
   * Add debian/upstream/metadata
   * Imported upstream version 2.13.1
+    + Drop debian/patches/fix-utf8-in-argv-handling, it was cherry-picked
+      from upstream.
 
  -- Axel Beckert <abe at debian.org>  Fri, 10 Apr 2015 23:06:24 +0200
 
diff --git a/debian/patches/fix-utf8-in-argv-handling b/debian/patches/fix-utf8-in-argv-handling
deleted file mode 100644
index 0ae824c..0000000
--- a/debian/patches/fix-utf8-in-argv-handling
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fixes regression in argv handling with utf8::all 0.013
-Origin: https://github.com/pghmcfc/perl5i/commit/6422710e0303c02b68f0f3634a34d5b0004a2ab5
-Bug-Debian: https://bugs.debian.org/759969
-
-Index: libperl5i-perl/lib/perl5i/2.pm
-===================================================================
---- libperl5i-perl.orig/lib/perl5i/2.pm	2014-08-31 01:55:37.507499142 +0200
-+++ libperl5i-perl/lib/perl5i/2.pm	2014-09-14 12:16:35.150561236 +0200
-@@ -127,10 +127,7 @@
-     },
-     'utf8::all' => sub {
-         my ($class, $caller) = @_;
--
--        # use utf8::all
--        require utf8::all;
--        utf8::all::import($class);
-+        load_in_caller($caller, ['utf8::all']);
-     },
-     Want => sub {
-         my ($class, $caller) = @_;
diff --git a/debian/patches/series b/debian/patches/series
index 661c573..82456cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 fix-test-for-mips
-fix-utf8-in-argv-handling

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