r45485 - in /trunk/libspreadsheet-xlsx-perl: Changes META.yml debian/changelog debian/control debian/copyright debian/rules lib/Spreadsheet/XLSX.pm lib/Spreadsheet/XLSX/Fmt2007.pm lib/Spreadsheet/XLSX/Utility2007.pm

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Thu Oct 8 14:27:14 UTC 2009


Author: jawnsy-guest
Date: Thu Oct  8 14:27:09 2009
New Revision: 45485

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=45485
Log:
* New upstream release
* Add myself to Uploaders and Copyright
* Use new short rules format
* Bump debhelper and quilt dependencies
* Drop perl version dependency (newer version is in oldstable)
* Standards-Version 3.8.3 (no changes)
* Slight rewrite of control description

Modified:
    trunk/libspreadsheet-xlsx-perl/Changes
    trunk/libspreadsheet-xlsx-perl/META.yml
    trunk/libspreadsheet-xlsx-perl/debian/changelog
    trunk/libspreadsheet-xlsx-perl/debian/control
    trunk/libspreadsheet-xlsx-perl/debian/copyright
    trunk/libspreadsheet-xlsx-perl/debian/rules
    trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX.pm
    trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX/Fmt2007.pm
    trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX/Utility2007.pm

Modified: trunk/libspreadsheet-xlsx-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-xlsx-perl/Changes?rev=45485&op=diff
==============================================================================
--- trunk/libspreadsheet-xlsx-perl/Changes (original)
+++ trunk/libspreadsheet-xlsx-perl/Changes Thu Oct  8 14:27:09 2009
@@ -1,4 +1,12 @@
 Revision history for Perl extension Spreadsheet::XLSX.
+
+0.12  Tue Oct  6 10:04:37 MSD 2009
+
+	- sheets are now detected by relations (xl/_rels/workbook.xml.rels), not numbers (RT #50236, thanks Pat Mariani)
+
+0.11  Mon Oct  5 19:03:46 MSD 2009
+
+	- sheets numbering fixed (RT #50211, thanks endacoe)
 
 0.1   Wed Mar 25 18:19:46 MSK 2009
 

Modified: trunk/libspreadsheet-xlsx-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-xlsx-perl/META.yml?rev=45485&op=diff
==============================================================================
--- trunk/libspreadsheet-xlsx-perl/META.yml (original)
+++ trunk/libspreadsheet-xlsx-perl/META.yml Thu Oct  8 14:27:09 2009
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:                Spreadsheet-XLSX
-version:             0.1
+version:             0.12
 abstract:            Perl extension for reading MS Excel 2007 files;
 license:             ~
 author:              

Modified: trunk/libspreadsheet-xlsx-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-xlsx-perl/debian/changelog?rev=45485&op=diff
==============================================================================
--- trunk/libspreadsheet-xlsx-perl/debian/changelog (original)
+++ trunk/libspreadsheet-xlsx-perl/debian/changelog Thu Oct  8 14:27:09 2009
@@ -1,8 +1,18 @@
-libspreadsheet-xlsx-perl (0.10-2) UNRELEASED; urgency=low
+libspreadsheet-xlsx-perl (0.12-1) UNRELEASED; urgency=low
 
+  [ Jonathan Yu ]
+  * New upstream release
+  * Add myself to Uploaders and Copyright
+  * Use new short rules format
+  * Bump debhelper and quilt dependencies
+  * Drop perl version dependency (newer version is in oldstable)
+  * Standards-Version 3.8.3 (no changes)
+  * Slight rewrite of control description
+
+  [ Nathan Handler ]
   * debian/watch: Update to ignore development releases.
 
- -- Nathan Handler <nhandler at ubuntu.com>  Sat, 06 Jun 2009 01:37:17 +0000
+ -- Jonathan Yu <jawnsy at cpan.org>  Thu, 08 Oct 2009 06:44:06 -0400
 
 libspreadsheet-xlsx-perl (0.10-1) unstable; urgency=low
 

Modified: trunk/libspreadsheet-xlsx-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-xlsx-perl/debian/control?rev=45485&op=diff
==============================================================================
--- trunk/libspreadsheet-xlsx-perl/debian/control (original)
+++ trunk/libspreadsheet-xlsx-perl/debian/control Thu Oct  8 14:27:09 2009
@@ -1,12 +1,12 @@
 Source: libspreadsheet-xlsx-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7), quilt
-Build-Depends-Indep: perl (>= 5.6.10-12), libarchive-zip-perl (>= 1.18),
+Build-Depends: debhelper (>= 7.0.8), quilt (>= 0.46-7)
+Build-Depends-Indep: perl, libarchive-zip-perl (>= 1.18),
  libspreadsheet-parseexcel-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: gregor herrmann <gregoa at debian.org>
-Standards-Version: 3.8.1
+Uploaders: gregor herrmann <gregoa at debian.org>, Jonathan Yu <jawnsy at cpan.org>
+Standards-Version: 3.8.3
 Homepage: http://search.cpan.org/dist/Spreadsheet-XLSX/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libspreadsheet-xlsx-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libspreadsheet-xlsx-perl/
@@ -16,7 +16,7 @@
 Depends: ${perl:Depends}, ${misc:Depends}, libarchive-zip-perl (>= 1.18),
  libspreadsheet-parseexcel-perl
 Description: Perl extension for reading MS Excel 2007 files
- Spreadsheet::XLSX is a (quick and dirty) emulation of Spreadsheet::ParseExcel
- for Excel 2007 (.xlsx) file format. It supports styles and many of Excel's
- quirks, but not all. It populates the classes from Spreadsheet::ParseExcel
- for interoperability; including Workbook, Worksheet, and Cell. 
+ Spreadsheet::XLSX emulates the behaviour of Spreadsheet::ParseExcel for the
+ Excel 2007 (.xlsx) file format. It supports styles and many, but not all, of
+ Excel's quirks. It populates the classes from Spreadsheet::ParseExcel for
+ interoperability; including Workbook, Worksheet, and Cell. 

Modified: trunk/libspreadsheet-xlsx-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-xlsx-perl/debian/copyright?rev=45485&op=diff
==============================================================================
--- trunk/libspreadsheet-xlsx-perl/debian/copyright (original)
+++ trunk/libspreadsheet-xlsx-perl/debian/copyright Thu Oct  8 14:27:09 2009
@@ -5,12 +5,13 @@
 Upstream-Name: Spreadsheet-XLSX
 
 Files: *
-Copyright: Copyright (C) 2008 by Dmitry Ovsyanko <do at eludia.ru>
+Copyright: 2008, Dmitry Ovsyanko <do at eludia.ru>
 License-Alias: Perl
 License: Artistic | GPL-1+
 
 Files: debian/*
-Copyright: 2008-2009, gregor herrmann <gregoa at debian.org>
+Copyright: 2009, Jonathan Yu <jawnsy at cpan.org>
+ 2008-2009, gregor herrmann <gregoa at debian.org>
 License: Artistic | GPL-1+
 
 License: Artistic

Modified: trunk/libspreadsheet-xlsx-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-xlsx-perl/debian/rules?rev=45485&op=diff
==============================================================================
--- trunk/libspreadsheet-xlsx-perl/debian/rules (original)
+++ trunk/libspreadsheet-xlsx-perl/debian/rules Thu Oct  8 14:27:09 2009
@@ -1,25 +1,4 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
-
-build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
-	dh build
-	touch $@
-
-clean: unpatch
-	dh $@
-
-install: install-stamp
-install-stamp: build-stamp
-	dh install
-	touch $@
-
-binary-arch:
-
-binary-indep: install
-	dh $@
-
-binary: binary-arch binary-indep
-
-.PHONY: binary binary-arch binary-indep install clean build
+%:
+	dh --with quilt $@

Modified: trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX.pm?rev=45485&op=diff
==============================================================================
--- trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX.pm (original)
+++ trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX.pm Thu Oct  8 14:27:09 2009
@@ -6,7 +6,7 @@
 
 our @ISA = qw();
 
-our $VERSION = '0.1';
+our $VERSION = '0.12';
 
 use Archive::Zip;
 use Spreadsheet::XLSX::Fmt2007;
@@ -71,7 +71,18 @@
 
         }
 
-		
+	my $member_rels = $self -> {zip} -> memberNamed ('xl/_rels/workbook.xml.rels') or die ("xl/_rels/workbook.xml.rels not found in this zip\n");
+	
+	my %rels = ();
+
+	foreach ($member_rels -> contents =~ /\<Relationship (.*?)\/?\>/g) {
+	
+		/^Id="(.*?)".*?Target="(.*?)"/ or next;
+		
+		$rels {$1} = $2;
+	
+	}
+
 	my $member_workbook = $self -> {zip} -> memberNamed ('xl/workbook.xml') or die ("xl/workbook.xml not found in this zip\n");
 	my $oBook = Spreadsheet::ParseExcel::Workbook->new;
 	$oBook->{SheetCount} = 0;
@@ -107,8 +118,10 @@
 				$sheet -> {Name} = $v;
 				$sheet -> {Name} = $converter -> convert ($sheet -> {Name}) if $converter;
 			}
-			elsif ($k eq 'r:id') {
-				($sheet -> {Id}) = $v =~ m{rId(\d+)};
+			elsif ($k eq 'r:id')	{
+			
+				$sheet -> {path} = $rels {$v};
+				
 			};
 					
 		}
@@ -122,10 +135,8 @@
 	$self -> {Worksheet} = \@Worksheet;
 	
 	foreach my $sheet (@Worksheet) {
-	
-		my $member_name  = "xl/worksheets/sheet$sheet->{Id}.xml";
-	
-		my $member_sheet = $self -> {zip} -> memberNamed ($member_name) or next;
+		
+		my $member_sheet = $self -> {zip} -> memberNamed ("xl/$sheet->{path}") or next;
 	
 		my ($row, $col);
 		
@@ -315,6 +326,8 @@
 	Rob Polocz
 	Gregor Herrmann
 	H.Merijn Brand
+	endacoe
+	Pat Mariani
 	
 =head1 ACKNOWLEDGEMENTS	
 

Modified: trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX/Fmt2007.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX/Fmt2007.pm?rev=45485&op=diff
==============================================================================
--- trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX/Fmt2007.pm (original)
+++ trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX/Fmt2007.pm Thu Oct  8 14:27:09 2009
@@ -8,7 +8,7 @@
 use warnings;
 
 use Spreadsheet::XLSX::Utility2007 qw(ExcelFmt);
-our $VERSION = '0.1'; # 
+our $VERSION = '0.12'; # 
 
 my %hFmtDefault = (
     0x00 => '@',

Modified: trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX/Utility2007.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX/Utility2007.pm?rev=45485&op=diff
==============================================================================
--- trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX/Utility2007.pm (original)
+++ trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX/Utility2007.pm Thu Oct  8 14:27:09 2009
@@ -13,7 +13,7 @@
 use vars qw(@ISA @EXPORT_OK);
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(ExcelFmt LocaltimeExcel ExcelLocaltime col2int int2col sheetRef xls2csv);
-our $VERSION = '0.1';
+our $VERSION = '0.12';
 
 my $sNUMEXP = '(^[+-]?\d+(\.\d+)?$)|(^[+-]?\d+\.?(\d*)[eE][+-](\d+))$';
 




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