r17325 - in /trunk/libspreadsheet-parseexcel-perl/debian: ./ patches/
gregoa-guest at users.alioth.debian.org
gregoa-guest at users.alioth.debian.org
Wed Mar 12 20:15:48 UTC 2008
Author: gregoa-guest
Date: Wed Mar 12 20:15:46 2008
New Revision: 17325
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=17325
Log:
Change patch system from dpatch to quilt.
Added:
trunk/libspreadsheet-parseexcel-perl/debian/patches/10objref.patch
trunk/libspreadsheet-parseexcel-perl/debian/patches/20general.patch
trunk/libspreadsheet-parseexcel-perl/debian/patches/30rstring.patch
trunk/libspreadsheet-parseexcel-perl/debian/patches/40saveparser.patch
trunk/libspreadsheet-parseexcel-perl/debian/patches/50_manpage_numbered_character.patch
trunk/libspreadsheet-parseexcel-perl/debian/patches/series
Removed:
trunk/libspreadsheet-parseexcel-perl/debian/patches/00list
trunk/libspreadsheet-parseexcel-perl/debian/patches/10objref.dpatch
trunk/libspreadsheet-parseexcel-perl/debian/patches/20general.dpatch
trunk/libspreadsheet-parseexcel-perl/debian/patches/30rstring.dpatch
trunk/libspreadsheet-parseexcel-perl/debian/patches/40saveparser.dpatch
trunk/libspreadsheet-parseexcel-perl/debian/patches/50_manpage_numbered_character.dpatch
Modified:
trunk/libspreadsheet-parseexcel-perl/debian/changelog
trunk/libspreadsheet-parseexcel-perl/debian/control
trunk/libspreadsheet-parseexcel-perl/debian/rules
Modified: trunk/libspreadsheet-parseexcel-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-parseexcel-perl/debian/changelog?rev=17325&op=diff
==============================================================================
--- trunk/libspreadsheet-parseexcel-perl/debian/changelog (original)
+++ trunk/libspreadsheet-parseexcel-perl/debian/changelog Wed Mar 12 20:15:46 2008
@@ -12,8 +12,9 @@
* debian/watch: use dist-based URL.
* Set Standards-Version to 3.7.3 (no changes).
* Add /me to Uploaders.
-
- -- gregor herrmann <gregor+debian at comodo.priv.at> Wed, 12 Mar 2008 21:10:30 +0100
+ * Change patch system from dpatch to quilt.
+
+ -- gregor herrmann <gregor+debian at comodo.priv.at> Wed, 12 Mar 2008 21:15:17 +0100
libspreadsheet-parseexcel-perl (0.3200-1) unstable; urgency=low
Modified: trunk/libspreadsheet-parseexcel-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-parseexcel-perl/debian/control?rev=17325&op=diff
==============================================================================
--- trunk/libspreadsheet-parseexcel-perl/debian/control (original)
+++ trunk/libspreadsheet-parseexcel-perl/debian/control Wed Mar 12 20:15:46 2008
@@ -9,7 +9,7 @@
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/wsvn/pkg-perl/trunk/libspreadsheet-parseexcel-perl/
-Build-Depends: debhelper (>= 5), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>= 5), quilt (>= 0.40)
Build-Depends-Indep: libole-storage-lite-perl, libspreadsheet-writeexcel-perl,
libjcode-pm-perl, libunicode-map-perl, libtest-pod-perl
Added: 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=17325&op=file
==============================================================================
--- trunk/libspreadsheet-parseexcel-perl/debian/patches/10objref.patch (added)
+++ trunk/libspreadsheet-parseexcel-perl/debian/patches/10objref.patch Wed Mar 12 20:15:46 2008
@@ -1,0 +1,29 @@
+Author: Niko Tyni <ntyni at iki.fi>
+Description: Allow IO::File/Handle/Wrap objects to be passed in.
+(#112130, patch by Gunnar Wolf)
+--- libspreadsheet-parseexcel-perl.orig/lib/Spreadsheet/ParseExcel.pm
++++ libspreadsheet-parseexcel-perl/lib/Spreadsheet/ParseExcel.pm
+@@ -430,6 +430,7 @@
+ sub _get_content {
+ my ($self, $source, $oBook) = @_;
+
++ my $ref = ref($source);
+ if(ref($source) eq "SCALAR") {
+ #1.1 Specified by Buffer
+ my ($sBIFF, $iLen) = $self->{GetContent}->($source);
+@@ -456,8 +457,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)) {
++ #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 {
+- #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);
Added: trunk/libspreadsheet-parseexcel-perl/debian/patches/20general.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-parseexcel-perl/debian/patches/20general.patch?rev=17325&op=file
==============================================================================
--- trunk/libspreadsheet-parseexcel-perl/debian/patches/20general.patch (added)
+++ trunk/libspreadsheet-parseexcel-perl/debian/patches/20general.patch Wed Mar 12 20:15:46 2008
@@ -1,0 +1,18 @@
+Author: Niko Tyni <ntyni at iki.fi>
+Description: Handle files generated by Openoffice with the format "GENERAL".
+(#298484)
+--- libspreadsheet-parseexcel-perl.orig/lib/Spreadsheet/ParseExcel/Utility.pm
++++ libspreadsheet-parseexcel-perl/lib/Spreadsheet/ParseExcel/Utility.pm
+@@ -27,6 +27,12 @@
+ my $sCond;
+ my $sWkF ='';
+ my $sRes='';
++
++ ### Debian-specific patch provided by Niko Tyni. Bug exists with ID 7206
++ ### in the CPAN request tracker.
++ # OpenOffice peculiarity?
++ $sFmt = '@' if ($sFmt eq "GENERAL");
++
+ #1. Get Condition
+ if($sFmt=~/^\[([<>=][^\]]+)\](.*)$/) {
+ $sCond = $1;
Added: 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=17325&op=file
==============================================================================
--- trunk/libspreadsheet-parseexcel-perl/debian/patches/30rstring.patch (added)
+++ trunk/libspreadsheet-parseexcel-perl/debian/patches/30rstring.patch Wed Mar 12 20:15:46 2008
@@ -1,0 +1,51 @@
+Author: Niko Tyni <ntyni at iki.fi>
+Description: Handle BIFF8 UTF16 strings in the 'RSTRING' opcode too, just
+like 'STRING'. (#299870)
+--- libspreadsheet-parseexcel-perl.orig/lib/Spreadsheet/ParseExcel.pm
++++ libspreadsheet-parseexcel-perl/lib/Spreadsheet/ParseExcel.pm
+@@ -648,10 +648,21 @@
+ 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);
++ $sTxt = $raBuff->[0];
++ $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));
++ }
+
+- #Has STRUN
+- if(length($sWk) > (8+$iL)) {
++ if($rich) {
+ _NewCell (
+ $oBook, $iR, $iC,
+ Kind => 'RString',
+@@ -659,9 +670,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 {
+@@ -672,7 +683,7 @@
+ FormatNo=> $iF,
+ Format => $oBook->{Format}[$iF],
+ Numeric => 0,
+- Code => '_native_',
++ Code => $sCode,
+ Book => $oBook,
+ );
+ }
Added: trunk/libspreadsheet-parseexcel-perl/debian/patches/40saveparser.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-parseexcel-perl/debian/patches/40saveparser.patch?rev=17325&op=file
==============================================================================
--- trunk/libspreadsheet-parseexcel-perl/debian/patches/40saveparser.patch (added)
+++ trunk/libspreadsheet-parseexcel-perl/debian/patches/40saveparser.patch Wed Mar 12 20:15:46 2008
@@ -1,0 +1,13 @@
+Author: Niko Tyni <ntyni at iki.fi>
+Description: make Spreadsheet::ParseExcel::SaveParser be usable on its own
+Debian #420122, [rt.cpan.org #26080]
+--- libspreadsheet-parseexcel-perl.orig/lib/Spreadsheet/ParseExcel/SaveParser.pm
++++ libspreadsheet-parseexcel-perl/lib/Spreadsheet/ParseExcel/SaveParser.pm
+@@ -11,6 +11,7 @@
+ use strict;
+ use warnings;
+
++use Spreadsheet::ParseExcel;
+ use base 'Spreadsheet::ParseExcel::Workbook';
+ our $VERSION = '0.06';
+
Added: trunk/libspreadsheet-parseexcel-perl/debian/patches/50_manpage_numbered_character.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-parseexcel-perl/debian/patches/50_manpage_numbered_character.patch?rev=17325&op=file
==============================================================================
--- trunk/libspreadsheet-parseexcel-perl/debian/patches/50_manpage_numbered_character.patch (added)
+++ trunk/libspreadsheet-parseexcel-perl/debian/patches/50_manpage_numbered_character.patch Wed Mar 12 20:15:46 2008
@@ -1,0 +1,15 @@
+Author: <gwolf at debian.org>
+Description: One of the contributors has a name with Unicode characters - That's
+nice and all, but troff does not like it. Substitute the character to
+the closest ASCII representateion.
+--- libspreadsheet-parseexcel-perl.orig/lib/Spreadsheet/ParseExcel.pm
++++ libspreadsheet-parseexcel-perl/lib/Spreadsheet/ParseExcel.pm
+@@ -2671,7 +2671,7 @@
+
+ In no particular order: Yamaji Haruna, Simamoto Takesi, Noguchi Harumi,
+ Ikezawa Kazuhiro, Suwazono Shugo, Hirofumi Morisada, Michael Edwards,
+-Kim Namusk, Slaven Rezić, Grant Stevens,
++Kim Namusk, Slaven Rezic, Grant Stevens,
+ and many many people + Kawai Mikako.
+
+ =cut
Added: trunk/libspreadsheet-parseexcel-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-parseexcel-perl/debian/patches/series?rev=17325&op=file
==============================================================================
--- trunk/libspreadsheet-parseexcel-perl/debian/patches/series (added)
+++ trunk/libspreadsheet-parseexcel-perl/debian/patches/series Wed Mar 12 20:15:46 2008
@@ -1,0 +1,5 @@
+10objref.patch
+20general.patch
+30rstring.patch
+40saveparser.patch
+50_manpage_numbered_character.patch
Modified: trunk/libspreadsheet-parseexcel-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-parseexcel-perl/debian/rules?rev=17325&op=diff
==============================================================================
--- trunk/libspreadsheet-parseexcel-perl/debian/rules (original)
+++ trunk/libspreadsheet-parseexcel-perl/debian/rules Wed Mar 12 20:15:46 2008
@@ -10,7 +10,7 @@
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
upstream: get-orig-source
get-orig-source:
More information about the Pkg-perl-cvs-commits
mailing list