Version in base suite: 0.105-1 Base version: libspreadsheet-wright-perl_0.105-1 Target version: libspreadsheet-wright-perl_0.105-1+deb10u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/libs/libspreadsheet-wright-perl/libspreadsheet-wright-perl_0.105-1.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/libs/libspreadsheet-wright-perl/libspreadsheet-wright-perl_0.105-1+deb10u1.dsc changelog | 11 ++ patches/0001-odsxml-properly-set-version-attribute.patch | 37 ++++++++++ patches/0002-ods-initialize-spreadsheet-before-addsheet.patch | 24 ++++++ patches/0003-json-fix-json_options.patch | 21 +++++ patches/series | 3 5 files changed, 96 insertions(+) diff -Nru libspreadsheet-wright-perl-0.105/debian/changelog libspreadsheet-wright-perl-0.105/debian/changelog --- libspreadsheet-wright-perl-0.105/debian/changelog 2014-06-18 14:41:26.000000000 +0000 +++ libspreadsheet-wright-perl-0.105/debian/changelog 2020-01-27 11:01:51.000000000 +0000 @@ -1,3 +1,14 @@ +libspreadsheet-wright-perl (0.105-1+deb10u1) buster; urgency=medium + + * Fixing previously unusable OpenDocument Spreadsheets + (https://rt.cpan.org/Ticket/Display.html?id=128919). + * Fixing previously unusable multisheet OpenDocument Spreadsheets + (https://rt.cpan.org/Ticket/Display.html?id=131334). + * Fixing passing JSON formatting options + (https://github.com/tobyink/p5-spreadsheet-wright/issues/5). + + -- Andrius Merkys Mon, 27 Jan 2020 06:01:51 -0500 + libspreadsheet-wright-perl (0.105-1) unstable; urgency=medium [ upstream ] diff -Nru libspreadsheet-wright-perl-0.105/debian/patches/0001-odsxml-properly-set-version-attribute.patch libspreadsheet-wright-perl-0.105/debian/patches/0001-odsxml-properly-set-version-attribute.patch --- libspreadsheet-wright-perl-0.105/debian/patches/0001-odsxml-properly-set-version-attribute.patch 1970-01-01 00:00:00.000000000 +0000 +++ libspreadsheet-wright-perl-0.105/debian/patches/0001-odsxml-properly-set-version-attribute.patch 2020-01-27 09:33:48.000000000 +0000 @@ -0,0 +1,37 @@ +Bug: https://rt.cpan.org/Ticket/Display.html?id=128919 +From 7947d5be1e1e66a3efc8701ab8eb412771e8faaf Mon Sep 17 00:00:00 2001 +From: Thadeu Lima de Souza Cascardo +Date: Sat, 23 Mar 2019 05:43:05 -0300 +Subject: [PATCH] odsxml: properly set version attribute + +The version attribute uses the office namespace. setAttributeNS should be used +to set it instead of setAttribute. + +Signed-off-by: Thadeu Lima de Souza Cascardo +--- + lib/Spreadsheet/Wright/OpenDocumentXML.pm | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/Spreadsheet/Wright/OpenDocumentXML.pm b/lib/Spreadsheet/Wright/OpenDocumentXML.pm +index 1f44cf4f1075..4bd70fb50009 100644 +--- a/lib/Spreadsheet/Wright/OpenDocumentXML.pm ++++ b/lib/Spreadsheet/Wright/OpenDocumentXML.pm +@@ -59,7 +59,7 @@ sub _prepare + $self->{'document'}->documentElement->setNamespace($nsuri, $prefix, $prefix eq 'office' ? 1 : 0); + } + $self->{'document'}->documentElement->setNodeName('office:document-content'); +- $self->{'document'}->documentElement->setAttribute(OFFICE_NS, 'version', '1.0'); ++ $self->{'document'}->documentElement->setAttributeNS(OFFICE_NS, 'version', '1.0'); + $self->{'body'} = $self->{'document'}->documentElement + ->addNewChild(OFFICE_NS, 'body') + ->addNewChild(OFFICE_NS, 'spreadsheet'); +@@ -133,4 +133,4 @@ sub _make_output + return $self->{'document'}->toString; + } + +-1; +\ No newline at end of file ++1; +-- +2.20.1 + diff -Nru libspreadsheet-wright-perl-0.105/debian/patches/0002-ods-initialize-spreadsheet-before-addsheet.patch libspreadsheet-wright-perl-0.105/debian/patches/0002-ods-initialize-spreadsheet-before-addsheet.patch --- libspreadsheet-wright-perl-0.105/debian/patches/0002-ods-initialize-spreadsheet-before-addsheet.patch 1970-01-01 00:00:00.000000000 +0000 +++ libspreadsheet-wright-perl-0.105/debian/patches/0002-ods-initialize-spreadsheet-before-addsheet.patch 2020-01-27 09:33:48.000000000 +0000 @@ -0,0 +1,24 @@ +Bug: https://rt.cpan.org/Ticket/Display.html?id=131334 +From 56a60ded778eed274fcb3f87bfa0e16d31b1ed67 Mon Sep 17 00:00:00 2001 +From: Andrius Merkys +Date: Fri, 3 Jan 2020 09:23:31 +0200 +Subject: [PATCH] Making sure the ODS spreadsheet is opened prior to the + addition of a new sheet. + +--- + lib/Spreadsheet/Wright/OpenDocumentXML.pm | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/Spreadsheet/Wright/OpenDocumentXML.pm b/lib/Spreadsheet/Wright/OpenDocumentXML.pm +index 1f44cf4..c1911cc 100644 +--- a/lib/Spreadsheet/Wright/OpenDocumentXML.pm ++++ b/lib/Spreadsheet/Wright/OpenDocumentXML.pm +@@ -72,6 +72,8 @@ sub addsheet + { + my ($self, $caption) = @_; + ++ $self->_open() or return; ++ + $self->{'tbody'} = $self->{'body'}->addNewChild(TABLE_NS, 'table'); + + if (defined $caption) diff -Nru libspreadsheet-wright-perl-0.105/debian/patches/0003-json-fix-json_options.patch libspreadsheet-wright-perl-0.105/debian/patches/0003-json-fix-json_options.patch --- libspreadsheet-wright-perl-0.105/debian/patches/0003-json-fix-json_options.patch 1970-01-01 00:00:00.000000000 +0000 +++ libspreadsheet-wright-perl-0.105/debian/patches/0003-json-fix-json_options.patch 2020-01-27 09:33:48.000000000 +0000 @@ -0,0 +1,21 @@ +Description: Fixing passing options to JSON printer. +Author: Andrius Merkys +Bug: https://github.com/tobyink/p5-spreadsheet-wright/issues/5 +--- a/lib/Spreadsheet/Wright/JSON.pm ++++ b/lib/Spreadsheet/Wright/JSON.pm +@@ -72,13 +72,13 @@ + if (1 == scalar keys %{$self->{'data'}}) + { + $self->{'_FH'}->print( +- to_json($self->{'data'}->{$self->{'_WORKSHEET'}}, $self->{'json_options'}) ++ to_json($self->{'data'}->{$self->{'_WORKSHEET'}}, $self->{'options'}{'json_options'}) + ); + } + else + { + $self->{'_FH'}->print( +- to_json($self->{'data'}, $self->{'json_options'}) ++ to_json($self->{'data'}, $self->{'options'}{'json_options'}) + ); + } + diff -Nru libspreadsheet-wright-perl-0.105/debian/patches/series libspreadsheet-wright-perl-0.105/debian/patches/series --- libspreadsheet-wright-perl-0.105/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ libspreadsheet-wright-perl-0.105/debian/patches/series 2020-01-27 09:33:48.000000000 +0000 @@ -0,0 +1,3 @@ +0001-odsxml-properly-set-version-attribute.patch +0002-ods-initialize-spreadsheet-before-addsheet.patch +0003-json-fix-json_options.patch