r48849 - in /trunk/libspreadsheet-parseexcel-perl/debian: changelog patches/10objref.patch patches/30rstring.patch

[jawnsy-guest at users.alioth.debian.org]

Author: jawnsy-guest
Date: Wed Dec 16 04:18:06 2009
New Revision: 48849

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=48849
Log:
Refresh patch 10objref.patch

Modified:
    trunk/libspreadsheet-parseexcel-perl/debian/changelog
    trunk/libspreadsheet-parseexcel-perl/debian/patches/10objref.patch
    trunk/libspreadsheet-parseexcel-perl/debian/patches/30rstring.patch

Modified: trunk/libspreadsheet-parseexcel-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-parseexcel-perl/debian/changelog?rev=48849&op=diff
==============================================================================
--- trunk/libspreadsheet-parseexcel-perl/debian/changelog (original)
+++ trunk/libspreadsheet-parseexcel-perl/debian/changelog Wed Dec 16 04:18:06 2009
@@ -1,6 +1,7 @@
 libspreadsheet-parseexcel-perl (0.5600-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Refresh patch 10objref.patch
 
  -- Jonathan Yu <jawnsy at cpan.org>  Wed, 09 Dec 2009 18:37:25 -0500
 

Modified: trunk/libspreadsheet-parseexcel-perl/debian/patches/10objref.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-parseexcel-perl/debian/patches/10objref.patch?rev=48849&op=diff
==============================================================================
--- trunk/libspreadsheet-parseexcel-perl/debian/patches/10objref.patch (original)
+++ trunk/libspreadsheet-parseexcel-perl/debian/patches/10objref.patch Wed Dec 16 04:18:06 2009
@@ -3,17 +3,16 @@
 (#112130, patch by Gunnar Wolf)
 --- a/lib/Spreadsheet/ParseExcel.pm
 +++ b/lib/Spreadsheet/ParseExcel.pm
-@@ -279,6 +279,7 @@
- sub _get_content {
-     my ( $self, $source, $oBook ) = @_;
+@@ -319,12 +319,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" ) {
  
-         #1.1 Specified by Buffer
-@@ -311,9 +312,17 @@
-         my ( $sBIFF, $iLen ) = $self->{GetContent}->( \$sData );
-         return $sBIFF ? ( $sBIFF, $iLen ) : (undef);
+         # Specified by a scalar buffer.
+         ( $biff_data, $data_length ) = $self->{GetContent}->($source);
+ 
      }
 +    elsif ( grep { $ref eq $_ } qw(IO::File IO::Handle IO::Wrap) ) {
 +
@@ -23,10 +22,6 @@
 +        my ( $sBIFF, $iLen ) = $self->{GetContent}->( \$sBuff );
 +        return $sBIFF ? ( $sBIFF, $iLen ) : (undef);
 +    }
-     else {
+     elsif (( ref($source) =~ /GLOB/ ) || ( ref($source) eq 'Fh' ) ) {
  
--        #1.4 Specified by File name
-+        #1.5 Specified by File name
-         $oBook->{File} = $source;
-         return undef unless ( -e $source );
-         my ( $sBIFF, $iLen ) = $self->{GetContent}->($source);
+         # For CGI.pm (Light FileHandle)

Modified: trunk/libspreadsheet-parseexcel-perl/debian/patches/30rstring.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-parseexcel-perl/debian/patches/30rstring.patch?rev=48849&op=diff
==============================================================================
--- trunk/libspreadsheet-parseexcel-perl/debian/patches/30rstring.patch (original)
+++ trunk/libspreadsheet-parseexcel-perl/debian/patches/30rstring.patch Wed Dec 16 04:18:06 2009
@@ -3,7 +3,7 @@
 like 'STRING'. (#299870)
 --- a/lib/Spreadsheet/ParseExcel.pm
 +++ b/lib/Spreadsheet/ParseExcel.pm
-@@ -530,10 +530,23 @@
+@@ -571,10 +571,23 @@
      my ( $oBook, $bOp, $bLen, $sWk ) = @_;
      my ( $iR, $iC, $iF, $iL, $sTxt );
      ( $iR, $iC, $iF, $iL ) = unpack( "v4", $sWk );
@@ -30,7 +30,7 @@
          _NewCell(
              $oBook, $iR, $iC,
              Kind     => 'RString',
-@@ -541,9 +554,9 @@
+@@ -582,9 +595,9 @@
              FormatNo => $iF,
              Format   => $oBook->{Format}[$iF],
              Numeric  => 0,
@@ -42,7 +42,7 @@
          );
      }
      else {
-@@ -554,7 +567,7 @@
+@@ -595,7 +608,7 @@
              FormatNo => $iF,
              Format   => $oBook->{Format}[$iF],
              Numeric  => 0,