[libcurses-perl] 03/03: Drop one patch and two hunks which were applied upstream

[Axel Beckert]

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

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

commit e197539682bfca37e421a0c0fc58b8d3181737b4
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Thu Sep 25 00:47:47 2014 +0200

    Drop one patch and two hunks which were applied upstream
---
 debian/changelog                        |  1 +
 debian/patches/pod-encoding.patch       | 30 +++++++-----------------------
 debian/patches/series                   |  1 -
 debian/patches/t_upstream_spelling.diff | 25 -------------------------
 4 files changed, 8 insertions(+), 49 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1ed0504..9f2c863 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libcurses-perl (1.32-1) UNRELEASED; urgency=medium
 
   [ Axel Beckert ]
   * Import new upstream release
+    + Drop one patch and two hunks which were applied upstream
 
  -- Salvatore Bonaccorso <carnil at debian.org>  Sat, 16 Aug 2014 09:30:48 +0200
 
diff --git a/debian/patches/pod-encoding.patch b/debian/patches/pod-encoding.patch
index 3ab9173..f00bf22 100644
--- a/debian/patches/pod-encoding.patch
+++ b/debian/patches/pod-encoding.patch
@@ -3,18 +3,11 @@ Description: fix Latin1 characters in POD, declare encding
  .
  Also fix the special characters to be valid Latin1
 Forwarded: https://rt.cpan.org/Ticket/Display?id=95825
---- a/Curses.pm
-+++ b/Curses.pm
-@@ -247,6 +247,8 @@ EOS
- 
- __END__
- 
-+=encoding Latin1
-+
- =head1 NAME
- 
- Curses - terminal screen handling and optimization
-@@ -400,7 +402,7 @@ If C<wget_wch()> is not available (i.e.
+Index: libcurses-perl/Curses.pm
+===================================================================
+--- libcurses-perl.orig/Curses.pm	2014-09-25 00:44:25.667422603 +0200
++++ libcurses-perl/Curses.pm	2014-09-25 00:44:25.667422603 +0200
+@@ -402,7 +404,7 @@
  wide characters), this calls C<wgetch()>, but returns the values described
  above nonetheless.  This can be a problem because with a multibyte character
  encoding like UTF-8, you will receive two one-character strings for a
@@ -23,21 +16,12 @@ Forwarded: https://rt.cpan.org/Ticket/Display?id=95825
  these characters to a Perl string, that string may internally contain a valid
  UTF-8 encoding of a character, but Perl will not interpret it that way. Perl
  may even try to convert what it believes to be two characters to UTF-8, giving
-@@ -435,7 +437,7 @@ failure.
+@@ -437,7 +439,7 @@
  
  =over 4
  
--	addstring("H��ll��, W��rld") ||��die "addstring failed";
+-	addstring("H��ll��, W��rld") ||�die "addstring failed";
 +	addstring("H�ll�, W�rld") ||�die "addstring failed";
  
  =back
  
-@@ -461,7 +463,7 @@ library provides no way to push back fun
- 
- =over 4
- 
--	ungetchar("X") ||��die "ungetchar failed";
-+	ungetchar("X") ||�die "ungetchar failed";
- 
- =back
- 
diff --git a/debian/patches/series b/debian/patches/series
index 00b0a06..ad832cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-t_upstream_spelling.diff
 libcurses-perl_hurd1.debdiff
 pod-encoding.patch
diff --git a/debian/patches/t_upstream_spelling.diff b/debian/patches/t_upstream_spelling.diff
deleted file mode 100644
index 0bfe8e7..0000000
--- a/debian/patches/t_upstream_spelling.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Franck Joncourt <franck at debian.org>
-Origin: vendor
-Subject: Fix spelling error
- This fixes a spelling error found in the pod documentation.
-Forwarded: https://rt.cpan.org/Ticket/Display?id=95824
-
-Signed-off-by: Franck Joncourt <franck.mail at dthconnex.com>
-
----
- Curses.pm |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/Curses.pm
-+++ b/Curses.pm
-@@ -603,8 +603,8 @@ William Setzer <William_Setzer at ncsu.edu>
- 
- =head2 Available Functions
- 
--    Avaiable Function    Unified?     Available via $OldCurses[*]
--    -----------------    --------     ------------------------
-+    Available Function   Unified?     Available via $OldCurses[*]
-+    ------------------   --------     ------------------------
-     addch                  Yes        waddch mvaddch mvwaddch
-     echochar               Yes        wechochar
-     addchstr               Yes        waddchstr mvaddchstr mvwaddchstr

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