r30250 - in /trunk/libspreadsheet-parseexcel-perl/debian: ./ patches/
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Thu Jan 29 18:17:52 UTC 2009
Author: gregoa
Date: Thu Jan 29 18:17:49 2009
New Revision: 30250
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=30250
Log:
Remove patches 20general.patch, 40saveparser.patch,
50_manpage_numbered_character.patch (applied upstream), refresh the
remaining patches.
Removed:
trunk/libspreadsheet-parseexcel-perl/debian/patches/20general.patch
trunk/libspreadsheet-parseexcel-perl/debian/patches/40saveparser.patch
trunk/libspreadsheet-parseexcel-perl/debian/patches/50_manpage_numbered_character.patch
Modified:
trunk/libspreadsheet-parseexcel-perl/debian/changelog
trunk/libspreadsheet-parseexcel-perl/debian/patches/10objref.patch
trunk/libspreadsheet-parseexcel-perl/debian/patches/30rstring.patch
trunk/libspreadsheet-parseexcel-perl/debian/patches/60_this_is_not_a_manpage
trunk/libspreadsheet-parseexcel-perl/debian/patches/series
Modified: trunk/libspreadsheet-parseexcel-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-parseexcel-perl/debian/changelog?rev=30250&op=diff
==============================================================================
--- trunk/libspreadsheet-parseexcel-perl/debian/changelog (original)
+++ trunk/libspreadsheet-parseexcel-perl/debian/changelog Thu Jan 29 18:17:49 2009
@@ -5,6 +5,9 @@
* debian/control: Added: ${misc:Depends} to Depends: field.
* New upstream release.
+ * Remove patches 20general.patch, 40saveparser.patch,
+ 50_manpage_numbered_character.patch (applied upstream), refresh the
+ remaining patches.
-- gregor herrmann <gregoa at debian.org> Sun, 16 Nov 2008 20:46:58 +0100
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=30250&op=diff
==============================================================================
--- trunk/libspreadsheet-parseexcel-perl/debian/patches/10objref.patch (original)
+++ trunk/libspreadsheet-parseexcel-perl/debian/patches/10objref.patch Thu Jan 29 18:17:49 2009
@@ -1,31 +1,32 @@
Author: Niko Tyni <ntyni at iki.fi>
Description: Allow IO::File/Handle/Wrap objects to be passed in.
(#112130, patch by Gunnar Wolf)
-Index: libspreadsheet-parseexcel-perl/lib/Spreadsheet/ParseExcel.pm
-===================================================================
---- libspreadsheet-parseexcel-perl.orig/lib/Spreadsheet/ParseExcel.pm 2008-10-12 19:45:48.000000000 -0500
-+++ libspreadsheet-parseexcel-perl/lib/Spreadsheet/ParseExcel.pm 2008-10-12 19:45:51.000000000 -0500
-@@ -253,6 +253,7 @@
+--- a/lib/Spreadsheet/ParseExcel.pm
++++ b/lib/Spreadsheet/ParseExcel.pm
+@@ -273,6 +273,7 @@
sub _get_content {
- my ($self, $source, $oBook) = @_;
+ my ( $self, $source, $oBook ) = @_;
+ my $ref = ref($source);
- if(ref($source) eq "SCALAR") {
+ if ( ref($source) eq "SCALAR" ) {
+
#1.1 Specified by Buffer
- my ($sBIFF, $iLen) = $self->{GetContent}->($source);
-@@ -279,8 +280,14 @@
- my $sData = join('', @$source);
- my ($sBIFF, $iLen) = $self->{GetContent}->(\$sData);
- return $sBIFF ? ($sBIFF, $iLen) : (undef);
-+ } elsif (grep {$ref eq $_} qw(IO::File IO::Handle IO::Wrap)) {
+@@ -305,9 +306,17 @@
+ my ( $sBIFF, $iLen ) = $self->{GetContent}->( \$sData );
+ return $sBIFF ? ( $sBIFF, $iLen ) : (undef);
+ }
++ elsif ( grep { $ref eq $_ } qw(IO::File IO::Handle IO::Wrap) ) {
++
+ #1.4 Specified by IO::File/Handle/Wrap object
+ $oBook->{File} = undef;
-+ my $sBuff = join('',$source->getlines);
-+ my ($sBIFF, $iLen) = $self->{GetContent}->(\$sBuff);
-+ return $sBIFF ? ($sBIFF, $iLen) : (undef);
- } else {
++ my $sBuff = join( '', $source->getlines );
++ my ( $sBIFF, $iLen ) = $self->{GetContent}->( \$sBuff );
++ return $sBIFF ? ( $sBIFF, $iLen ) : (undef);
++ }
+ else {
+
- #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);
+ return undef unless ( -e $source );
+ my ( $sBIFF, $iLen ) = $self->{GetContent}->($source);
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=30250&op=diff
==============================================================================
--- trunk/libspreadsheet-parseexcel-perl/debian/patches/30rstring.patch (original)
+++ trunk/libspreadsheet-parseexcel-perl/debian/patches/30rstring.patch Thu Jan 29 18:17:49 2009
@@ -1,53 +1,53 @@
Author: Niko Tyni <ntyni at iki.fi>
Description: Handle BIFF8 UTF16 strings in the 'RSTRING' opcode too, just
like 'STRING'. (#299870)
-Index: libspreadsheet-parseexcel-perl/lib/Spreadsheet/ParseExcel.pm
-===================================================================
---- libspreadsheet-parseexcel-perl.orig/lib/Spreadsheet/ParseExcel.pm 2008-10-12 19:45:51.000000000 -0500
-+++ libspreadsheet-parseexcel-perl/lib/Spreadsheet/ParseExcel.pm 2008-10-12 19:46:00.000000000 -0500
-@@ -471,10 +471,21 @@
- my($oBook, $bOp, $bLen, $sWk) = @_;
- my($iR, $iC, $iF, $iL, $sTxt);
- ($iR, $iC, $iF, $iL) = unpack("v4", $sWk);
-- $sTxt = substr($sWk, 8, $iL);
+--- a/lib/Spreadsheet/ParseExcel.pm
++++ b/lib/Spreadsheet/ParseExcel.pm
+@@ -523,10 +523,23 @@
+ my ( $oBook, $bOp, $bLen, $sWk ) = @_;
+ my ( $iR, $iC, $iF, $iL, $sTxt );
+ ( $iR, $iC, $iF, $iL ) = unpack( "v4", $sWk );
+- $sTxt = substr( $sWk, 8, $iL );
+ my $bver = $oBook->{BIFFVersion};
-+ my ($rich, $sCode);
-+ if($bver == verBIFF8) {
-+ my( $raBuff, @rest) = _convBIFF8String($oBook, substr($sWk, 6), 1);
++ my ( $rich, $sCode );
++ if ( $bver == verBIFF8 ) {
++ my ( $raBuff, @rest ) =
++ _convBIFF8String( $oBook, substr( $sWk, 6 ), 1 );
+ $sTxt = $raBuff->[0];
-+ $sCode = ($raBuff->[1])? 'ucs2': undef;
-+ $rich = $raBuff->[2];
-+ } else {
-+ $sTxt = substr($sWk, 8, $iL);
++ $sCode = ( $raBuff->[1] ) ? 'ucs2' : undef;
++ $rich = $raBuff->[2];
++ }
++ else {
++ $sTxt = substr( $sWk, 8, $iL );
+ $sCode = '_native_';
-+ $rich = substr($sWk, (8+$iL)+1)
-+ if (length($sWk) > (8+$iL));
++ $rich = substr( $sWk, ( 8 + $iL ) + 1 )
++ if ( length($sWk) > ( 8 + $iL ) );
+ }
- #Has STRUN
-- if(length($sWk) > (8+$iL)) {
-+ if($rich) {
- _NewCell (
+- if ( length($sWk) > ( 8 + $iL ) ) {
++ if ($rich) {
+ _NewCell(
$oBook, $iR, $iC,
- Kind => 'RString',
-@@ -482,9 +493,9 @@
- FormatNo=> $iF,
- Format => $oBook->{Format}[$iF],
- Numeric => 0,
-- Code => '_native_', #undef,
-+ Code => $sCode,
- Book => $oBook,
-- Rich => substr($sWk, (8+$iL)+1),
-+ Rich => $rich,
+ Kind => 'RString',
+@@ -534,9 +547,9 @@
+ FormatNo => $iF,
+ Format => $oBook->{Format}[$iF],
+ Numeric => 0,
+- Code => '_native_', #undef,
++ Code => $sCode,
+ Book => $oBook,
+- Rich => substr( $sWk, ( 8 + $iL ) + 1 ),
++ Rich => $rich,
);
}
else {
-@@ -495,7 +506,7 @@
- FormatNo=> $iF,
- Format => $oBook->{Format}[$iF],
- Numeric => 0,
-- Code => '_native_',
-+ Code => $sCode,
- Book => $oBook,
+@@ -547,7 +560,7 @@
+ FormatNo => $iF,
+ Format => $oBook->{Format}[$iF],
+ Numeric => 0,
+- Code => '_native_',
++ Code => $sCode,
+ Book => $oBook,
);
}
Modified: trunk/libspreadsheet-parseexcel-perl/debian/patches/60_this_is_not_a_manpage
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-parseexcel-perl/debian/patches/60_this_is_not_a_manpage?rev=30250&op=diff
==============================================================================
--- trunk/libspreadsheet-parseexcel-perl/debian/patches/60_this_is_not_a_manpage (original)
+++ trunk/libspreadsheet-parseexcel-perl/debian/patches/60_this_is_not_a_manpage Thu Jan 29 18:17:49 2009
@@ -1,11 +1,14 @@
-Index: libspreadsheet-parseexcel-perl/lib/Spreadsheet/ParseExcel/SaveParser/Workbook.pm
-===================================================================
---- libspreadsheet-parseexcel-perl.orig/lib/Spreadsheet/ParseExcel/SaveParser/Workbook.pm 2008-10-12 19:54:34.000000000 -0500
-+++ libspreadsheet-parseexcel-perl/lib/Spreadsheet/ParseExcel/SaveParser/Workbook.pm 2008-10-12 19:56:43.000000000 -0500
-@@ -183,15 +183,18 @@
- $oWrS->set_h_pagebreaks(@{$oWkS->{HPageBreak}});
+Author: Gunnar Wolf <gwolf at debian.org>
+Description: Commented out heafily incomplete manpage for
+ Spreadsheet::ParseExcel::SaveParser::Workbook, which is more a comment than
+ documentation. Lintian is surely happier this way.
+
+--- a/lib/Spreadsheet/ParseExcel/SaveParser/Workbook.pm
++++ b/lib/Spreadsheet/ParseExcel/SaveParser/Workbook.pm
+@@ -228,15 +228,18 @@
# Veritical Page Breaks
- $oWrS->set_v_pagebreaks(@{$oWkS->{VPageBreak}});
+ $oWrS->set_v_pagebreaks( @{ $oWkS->{VPageBreak} } );
+
-=pod
-
- PageStart => $oWkS->{PageStart}, # Page number for start
@@ -20,13 +23,13 @@
+#### refer to Spreadsheet::ParseExcel::SaveParser.
+# =pod
+#
-+# PageStart => $oWkS->{PageStart}, # Page number for start
-+# UsePage => $oWkS->{UsePage}, # Use own start page number
-+# NoColor => $oWkS->{NoColor}, # Print in blcak-white
-+# Draft => $oWkS->{Draft}, # Print in draft mode
-+# Notes => $oWkS->{Notes}, # Print notes
-+# LeftToRight => $oWkS->{LeftToRight}, # Left to Right
++# PageStart => $oWkS->{PageStart}, # Page number for start
++# UsePage => $oWkS->{UsePage}, # Use own start page number
++# NoColor => $oWkS->{NoColor}, # Print in blcak-white
++# Draft => $oWkS->{Draft}, # Print in draft mode
++# Notes => $oWkS->{Notes}, # Print notes
++# LeftToRight => $oWkS->{LeftToRight}, # Left to Right
+# =cut
- for(my $iC = $oWkS->{MinCol} ;
- defined $oWkS->{MaxCol} && $iC <= $oWkS->{MaxCol} ; $iC++) {
- if(defined $oWkS->{ColWidth}[$iC]) {
+
+ for (
+ my $iC = $oWkS->{MinCol} ;
Modified: trunk/libspreadsheet-parseexcel-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-parseexcel-perl/debian/patches/series?rev=30250&op=diff
==============================================================================
--- trunk/libspreadsheet-parseexcel-perl/debian/patches/series (original)
+++ trunk/libspreadsheet-parseexcel-perl/debian/patches/series Thu Jan 29 18:17:49 2009
@@ -1,6 +1,3 @@
10objref.patch
-20general.patch
30rstring.patch
-40saveparser.patch
-50_manpage_numbered_character.patch
60_this_is_not_a_manpage
More information about the Pkg-perl-cvs-commits
mailing list