[libspreadsheet-parseexcel-perl] 05/07: Drop 10objref.patch, feature incorporated upstream

[Florian Schlichting]

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

fsfs pushed a commit to branch master
in repository libspreadsheet-parseexcel-perl.

commit 9ddfe8638ae509efada33670c5265ac84dad5366
Author: Florian Schlichting <fsfs at debian.org>
Date:   Fri Apr 25 00:02:18 2014 +0200

    Drop 10objref.patch, feature incorporated upstream
---
 debian/patches/10objref.patch  | 32 --------------------------------
 debian/patches/30rstring.patch |  8 ++++----
 debian/patches/series          |  1 -
 3 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/debian/patches/10objref.patch b/debian/patches/10objref.patch
deleted file mode 100644
index 6a580df..0000000
--- a/debian/patches/10objref.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Allow IO::File/Handle/Wrap objects to be passed in.
-Bug-Debian: http://bugs.debian.org/112130
-Forwarded: no
-Author: Gunnar Wolf <gwolf at debian.org>
-Reviewed-by: Niko Tyni <ntyni at iki.fi>
-Reviewed-by: gregor herrmann <gregoa at debian.org>
-Last-Update: 2011-04-24
-
---- a/lib/Spreadsheet/ParseExcel.pm
-+++ b/lib/Spreadsheet/ParseExcel.pm
-@@ -601,12 +601,21 @@
-     # Reset the error status in case method is called more than once.
-     $self->{_error_status} = ErrorNone;
- 
-+    my $ref = ref($source);
-     if ( ref( $source ) eq "SCALAR" ) {
- 
-         # Specified by a scalar buffer.
-         ( $biff_data, $data_length ) = $self->{GetContent}->( $source );
- 
-     }
-+    elsif ( grep { $ref eq $_ } qw(IO::File IO::Handle IO::Wrap) ) {
-+
-+        # Specified by IO::File/Handle/Wrap object
-+        $workbook->{File} = undef;
-+        my $sBuff = join( '', $source->getlines );
-+        my ( $sBIFF, $iLen ) = $self->{GetContent}->( \$sBuff );
-+        return $sBIFF ? ( $sBIFF, $iLen ) : (undef);
-+    }
-     elsif ( ( ref( $source ) =~ /GLOB/ ) || ( ref( $source ) eq 'Fh' ) ) {
- 
-         # For CGI.pm (Light FileHandle)
diff --git a/debian/patches/30rstring.patch b/debian/patches/30rstring.patch
index f81a8af..d5d36ce 100644
--- a/debian/patches/30rstring.patch
+++ b/debian/patches/30rstring.patch
@@ -1,14 +1,14 @@
 Description: Handle BIFF8 UTF16 strings in the 'RSTRING' opcode too, just
  like 'STRING'.
 Bug-Debian: http://bugs.debian.org/299870
-Forwarded: no
+Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=16786
 Author: Niko Tyni <ntyni at iki.fi>
 Reviewed-by: gregor herrmann <gregoa at debian.org>
 Last-Update: 2011-04-24
 
 --- a/lib/Spreadsheet/ParseExcel.pm
 +++ b/lib/Spreadsheet/ParseExcel.pm
-@@ -861,10 +861,23 @@
+@@ -898,10 +898,23 @@
      my ( $oBook, $bOp, $bLen, $sWk ) = @_;
      my ( $iR, $iC, $iF, $iL, $sTxt );
      ( $iR, $iC, $iF, $iL ) = unpack( "v4", $sWk );
@@ -35,7 +35,7 @@ Last-Update: 2011-04-24
          _NewCell(
              $oBook, $iR, $iC,
              Kind     => 'RString',
-@@ -872,9 +885,9 @@
+@@ -909,9 +922,9 @@
              FormatNo => $iF,
              Format   => $oBook->{Format}[$iF],
              Numeric  => 0,
@@ -47,7 +47,7 @@ Last-Update: 2011-04-24
          );
      }
      else {
-@@ -885,7 +898,7 @@
+@@ -922,7 +935,7 @@
              FormatNo => $iF,
              Format   => $oBook->{Format}[$iF],
              Numeric  => 0,
diff --git a/debian/patches/series b/debian/patches/series
index f41431a..34c1ec9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-10objref.patch
 30rstring.patch
 digest_md5.patch

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