r73389 - in /trunk/libspreadsheet-parseexcel-perl/debian: changelog compat control copyright patches/10objref.patch patches/30rstring.patch

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Sun Apr 24 13:55:34 UTC 2011


Author: gregoa
Date: Sun Apr 24 13:55:18 2011
New Revision: 73389

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=73389
Log:
* debian/copyright: update years of upstream and packaging copyright.
* Refresh patches.
* Set Standards-Version to 3.9.2 (no changes).
* Bump debhelper compatibility level to 8.
* Remove version from libtest-pod-perl build dependency, already satisfied
  in oldstable.

Modified:
    trunk/libspreadsheet-parseexcel-perl/debian/changelog
    trunk/libspreadsheet-parseexcel-perl/debian/compat
    trunk/libspreadsheet-parseexcel-perl/debian/control
    trunk/libspreadsheet-parseexcel-perl/debian/copyright
    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=73389&op=diff
==============================================================================
--- trunk/libspreadsheet-parseexcel-perl/debian/changelog (original)
+++ trunk/libspreadsheet-parseexcel-perl/debian/changelog Sun Apr 24 13:55:18 2011
@@ -1,6 +1,12 @@
 libspreadsheet-parseexcel-perl (0.5900-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/copyright: update years of upstream and packaging copyright.
+  * Refresh patches.
+  * Set Standards-Version to 3.9.2 (no changes).
+  * Bump debhelper compatibility level to 8.
+  * Remove version from libtest-pod-perl build dependency, already satisfied
+    in oldstable.
 
  -- gregor herrmann <gregoa at debian.org>  Sun, 24 Apr 2011 15:39:25 +0200
 

Modified: trunk/libspreadsheet-parseexcel-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-parseexcel-perl/debian/compat?rev=73389&op=diff
==============================================================================
--- trunk/libspreadsheet-parseexcel-perl/debian/compat (original)
+++ trunk/libspreadsheet-parseexcel-perl/debian/compat Sun Apr 24 13:55:18 2011
@@ -1,1 +1,1 @@
-7
+8

Modified: trunk/libspreadsheet-parseexcel-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-parseexcel-perl/debian/control?rev=73389&op=diff
==============================================================================
--- trunk/libspreadsheet-parseexcel-perl/debian/control (original)
+++ trunk/libspreadsheet-parseexcel-perl/debian/control Sun Apr 24 13:55:18 2011
@@ -1,24 +1,33 @@
 Source: libspreadsheet-parseexcel-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7.0.50)
-Build-Depends-Indep: perl, libole-storage-lite-perl (>= 0.19),
- libspreadsheet-writeexcel-perl, libjcode-pm-perl, libtest-pod-perl (>= 1.26),
- perl (>= 5.10.1) | libpod-simple-perl (>= 3.07), libtest-minimumversion-perl,
- libunicode-map-perl, libtest-cpan-meta-perl
+Build-Depends: debhelper (>= 8)
+Build-Depends-Indep: perl,
+ libjcode-pm-perl,
+ libole-storage-lite-perl (>= 0.19),
+ libspreadsheet-writeexcel-perl,
+ libtest-cpan-meta-perl.
+ libtest-minimumversion-perl,
+ libtest-pod-perl,
+ libunicode-map-perl,
+ perl (>= 5.10.1) | libpod-simple-perl (>= 3.07)
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Niko Tyni <ntyni at iki.fi>,
- Damyan Ivanov <dmn at debian.org>, gregor herrmann <gregoa at debian.org>,
+ Damyan Ivanov <dmn at debian.org>,
+ gregor herrmann <gregoa at debian.org>,
  Jonathan Yu <jawnsy at cpan.org>
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://search.cpan.org/dist/Spreadsheet-ParseExcel/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libspreadsheet-parseexcel-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libspreadsheet-parseexcel-perl/
 
 Package: libspreadsheet-parseexcel-perl
 Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, libole-storage-lite-perl (>= 0.19),
- libspreadsheet-writeexcel-perl, libjcode-pm-perl, libunicode-map-perl
+Depends: ${misc:Depends}, ${perl:Depends},
+ libjcode-pm-perl,
+ libole-storage-lite-perl (>= 0.19),
+ libspreadsheet-writeexcel-perl,
+ libunicode-map-perl
 Description: Perl module to access information from Excel Spreadsheets
  Spreadsheet::ParseExcel is a Perl module allows one to extract information
  from Excel spreadsheets. It can be used to read information from an Excel

Modified: trunk/libspreadsheet-parseexcel-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-parseexcel-perl/debian/copyright?rev=73389&op=diff
==============================================================================
--- trunk/libspreadsheet-parseexcel-perl/debian/copyright (original)
+++ trunk/libspreadsheet-parseexcel-perl/debian/copyright Sun Apr 24 13:55:18 2011
@@ -4,14 +4,14 @@
 Name: Spreadsheet-ParseExcel
 
 Files: *
-Copyright: 2009-2010, John McNamara <jmcnamara at cpan.org>
+Copyright: 2009-2011, John McNamara <jmcnamara at cpan.org>
  2006-2008, Gabor Szabo <szabgab at cpan.org>
  2000-2006, Kawai Takanori <kwitknr at cpan.org>
 License: GPL-1+ or Artistic
 
 Files: debian/*
 Copyright: 2009-2010, Jonathan Yu <jawnsy at cpan.org>
- 2008-2010, gregor herrmann <gregoa at debian.org>
+ 2008-2011, gregor herrmann <gregoa at debian.org>
  2006-2007, Niko Tyni <ntyni at iki.fi>
  2005-2008, Gunnar Wolf <gwolf at debian.org>
  2001-2004, Dirk Eddelbuettel <edd at debian.org>

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=73389&op=diff
==============================================================================
--- trunk/libspreadsheet-parseexcel-perl/debian/patches/10objref.patch (original)
+++ trunk/libspreadsheet-parseexcel-perl/debian/patches/10objref.patch Sun Apr 24 13:55:18 2011
@@ -4,19 +4,19 @@
 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: 2010-10-05
+Last-Update: 2011-04-24
 
 --- a/lib/Spreadsheet/ParseExcel.pm
 +++ b/lib/Spreadsheet/ParseExcel.pm
-@@ -320,12 +320,21 @@
+@@ -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" ) {
+     if ( ref( $source ) eq "SCALAR" ) {
  
          # Specified by a scalar buffer.
-         ( $biff_data, $data_length ) = $self->{GetContent}->($source);
+         ( $biff_data, $data_length ) = $self->{GetContent}->( $source );
  
      }
 +    elsif ( grep { $ref eq $_ } qw(IO::File IO::Handle IO::Wrap) ) {
@@ -27,6 +27,6 @@
 +        my ( $sBIFF, $iLen ) = $self->{GetContent}->( \$sBuff );
 +        return $sBIFF ? ( $sBIFF, $iLen ) : (undef);
 +    }
-     elsif (( ref($source) =~ /GLOB/ ) || ( ref($source) eq 'Fh' ) ) {
+     elsif ( ( ref( $source ) =~ /GLOB/ ) || ( ref( $source ) eq 'Fh' ) ) {
  
          # 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=73389&op=diff
==============================================================================
--- trunk/libspreadsheet-parseexcel-perl/debian/patches/30rstring.patch (original)
+++ trunk/libspreadsheet-parseexcel-perl/debian/patches/30rstring.patch Sun Apr 24 13:55:18 2011
@@ -4,11 +4,11 @@
 Forwarded: no
 Author: Niko Tyni <ntyni at iki.fi>
 Reviewed-by: gregor herrmann <gregoa at debian.org>
-Last-Update: 2010-10-05
+Last-Update: 2011-04-24
 
 --- a/lib/Spreadsheet/ParseExcel.pm
 +++ b/lib/Spreadsheet/ParseExcel.pm
-@@ -580,10 +580,23 @@
+@@ -861,10 +861,23 @@
      my ( $oBook, $bOp, $bLen, $sWk ) = @_;
      my ( $iR, $iC, $iF, $iL, $sTxt );
      ( $iR, $iC, $iF, $iL ) = unpack( "v4", $sWk );
@@ -30,12 +30,12 @@
 +    }
  
 -    #Has STRUN
--    if ( length($sWk) > ( 8 + $iL ) ) {
+-    if ( length( $sWk ) > ( 8 + $iL ) ) {
 +    if ($rich) {
          _NewCell(
              $oBook, $iR, $iC,
              Kind     => 'RString',
-@@ -591,9 +604,9 @@
+@@ -872,9 +885,9 @@
              FormatNo => $iF,
              Format   => $oBook->{Format}[$iF],
              Numeric  => 0,
@@ -47,7 +47,7 @@
          );
      }
      else {
-@@ -604,7 +617,7 @@
+@@ -885,7 +898,7 @@
              FormatNo => $iF,
              Format   => $oBook->{Format}[$iF],
              Numeric  => 0,




More information about the Pkg-perl-cvs-commits mailing list