[pkg-java] r18329 - in tags/libapache-poi-java: . 3.10.1-1/debian 3.10.1-1/debian/patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Aug 28 21:48:49 UTC 2014
Author: ebourg-guest
Date: 2014-08-28 21:48:49 +0000 (Thu, 28 Aug 2014)
New Revision: 18329
Added:
tags/libapache-poi-java/3.10.1-1/
tags/libapache-poi-java/3.10.1-1/debian/ant.properties
tags/libapache-poi-java/3.10.1-1/debian/changelog
tags/libapache-poi-java/3.10.1-1/debian/patches/01_disable-code-coverage.patch
tags/libapache-poi-java/3.10.1-1/debian/patches/04_jar_names.patch
tags/libapache-poi-java/3.10.1-1/debian/patches/05_use-local-ooxml-xsds.patch
tags/libapache-poi-java/3.10.1-1/debian/patches/06_java8-compatibility.patch
tags/libapache-poi-java/3.10.1-1/debian/patches/series
Removed:
tags/libapache-poi-java/3.10.1-1/debian/ant.properties
tags/libapache-poi-java/3.10.1-1/debian/changelog
tags/libapache-poi-java/3.10.1-1/debian/patches/01_disable-code-coverage.patch
tags/libapache-poi-java/3.10.1-1/debian/patches/04_jar_names.patch
tags/libapache-poi-java/3.10.1-1/debian/patches/05_use-local-ooxml-xsds.patch
tags/libapache-poi-java/3.10.1-1/debian/patches/series
Log:
[svn-buildpackage] Tagging libapache-poi-java 3.10.1-1
Deleted: tags/libapache-poi-java/3.10.1-1/debian/ant.properties
===================================================================
--- trunk/libapache-poi-java/debian/ant.properties 2014-07-15 13:47:35 UTC (rev 18257)
+++ tags/libapache-poi-java/3.10.1-1/debian/ant.properties 2014-08-28 21:48:49 UTC (rev 18329)
@@ -1,11 +0,0 @@
-disconnected=true
-jars.present=true
-halt.on.test.failure=true
-main.ant.jar=/usr/share/java/ant.jar
-main.commons-codec.jar=/usr/share/java/commons-codec.jar
-main.commons-logging.jar=/usr/share/java/commons-logging.jar
-main.log4j.jar=/usr/share/java/log4j-1.2.jar
-main.junit.jar=/usr/share/java/junit4.jar
-ooxml.xsds.tmp.dir=ooxml-xsds
-ooxml.dom4j.jar=/usr/share/java/dom4j.jar
-ooxml.xmlbeans.jar=/usr/share/java/xmlbeans.jar
Copied: tags/libapache-poi-java/3.10.1-1/debian/ant.properties (from rev 18328, trunk/libapache-poi-java/debian/ant.properties)
===================================================================
--- tags/libapache-poi-java/3.10.1-1/debian/ant.properties (rev 0)
+++ tags/libapache-poi-java/3.10.1-1/debian/ant.properties 2014-08-28 21:48:49 UTC (rev 18329)
@@ -0,0 +1,12 @@
+disconnected=true
+jars.present=true
+halt.on.test.failure=true
+main.ant.jar=/usr/share/java/ant.jar
+main.commons-codec.jar=/usr/share/java/commons-codec.jar
+main.commons-logging.jar=/usr/share/java/commons-logging.jar
+main.log4j.jar=/usr/share/java/log4j-1.2.jar
+main.junit.jar=/usr/share/java/junit4.jar
+ooxml.xsds.tmp.dir=ooxml-xsds
+ooxml.dom4j.jar=/usr/share/java/dom4j.jar
+ooxml.xmlbeans23.jar=/usr/share/java/xmlbeans.jar
+ooxml.xmlbeans26.jar=/usr/share/java/xmlbeans.jar
Deleted: tags/libapache-poi-java/3.10.1-1/debian/changelog
===================================================================
--- trunk/libapache-poi-java/debian/changelog 2014-07-15 13:47:35 UTC (rev 18257)
+++ tags/libapache-poi-java/3.10.1-1/debian/changelog 2014-08-28 21:48:49 UTC (rev 18329)
@@ -1,219 +0,0 @@
-libapache-poi-java (3.10-1) unstable; urgency=medium
-
- * New upstream release
- - Refreshed the patches
- - Build depend on junit4 instead of junit
- - Added a patch disabling the code coverage report
- * Standards-Version updated to 3.9.5 (no changes)
- * Switch to debhelper level 9
- * Use XZ compression for the upstream tarball
-
- -- Emmanuel Bourg <ebourg at apache.org> Tue, 25 Feb 2014 15:17:18 +0100
-
-libapache-poi-java (3.9-1) unstable; urgency=low
-
- [ Emmanuel Bourg ]
- * New upstream release
- - Refreshed the patches
- - Removed poi-contrib.jar (merged into poi.jar and poi-examples.jar)
- - Removed the unused dependencies on commons-beanutils, commons-lang
- and xalan
- - Added a dependency on libcommons-codec-java
- - Added the new excelant component (Excel Ant tasks)
- * Removed the patches 01_javac_encoding.patch and 02_classpath.patch
- * Enabled the unit tests
- * Added the classpath attribute in the manifests
- * Enabled the ooxml modules (Closes: #658288)
- - Removed the patch 03_no_ooxml.patch
- - Updated debian/orig-tar.sh to fetch the OOXML schemas from the ECMA site
- - Added a dependency on libxmlbeans-java
- - Updated debian/copyright to document the license of the OOXML schemas
- * debian/control:
- - Updated Standards-Version to 3.9.4 (no changes)
- - Use canonical URLs for the Vcs-* fields
- - Removed Michael Koch from the uploaders (Closes: #654046)
- - Improved the package description
- * debian/rules: Improved the clean target
- * Updated the debian/README.* files
-
- [ tony mancill ]
- * Update debian/copyright to DEP5 format; clarify license of
- chunks_parse_cmds.tbl. (Closes: #659067)
-
- -- Emmanuel Bourg <ebourg at apache.org> Tue, 09 Jul 2013 23:10:21 +0200
-
-libapache-poi-java (3.6+dfsg-2) unstable; urgency=low
-
- * Rename package from jakarta-poi to apache-poi. Add appropriate Conflicts,
- Replaces, and Provides.
- * Keep some compatibility symlinks in /usr/share/java.
- * Remove Java runtime from Depends.
- * Switch to source format 3.0.
- * Remove Christian from Uploaders list.
- * Switch to debhelper level 7.
- * Update Standards-Version: 3.9.2.
-
- -- Torsten Werner <twerner at debian.org> Wed, 07 Sep 2011 22:08:56 +0200
-
-libjakarta-poi-java (3.6+dfsg-1) unstable; urgency=low
-
- * New upstream release.
- - refresh all patches
- * Remove Arnaud Vandyck from Uploaders
- * Fix debian/watch to track upstream tarballs naming changes
-
- -- Damien Raude-Morvan <drazzib at debian.org> Wed, 30 Dec 2009 23:18:25 +0100
-
-libjakarta-poi-java (3.5+dfsg-1) unstable; urgency=low
-
- * New upstream release.
- - 01_javac_encoding: refreshed
- - 02_classpath: use Debian JAR for build
- - 03_no_ooxml: disable ooxml module (use non-free JARs)
- - 04_jar_names: strip DSTAMP for JARs filenames
- * Update my email address
- * debian/orig-tar.exclude: Update exclusion file list
-
- -- Damien Raude-Morvan <drazzib at debian.org> Thu, 01 Oct 2009 00:36:43 +0200
-
-libjakarta-poi-java (3.2+dfsg-1) unstable; urgency=low
-
- * New upstream release (Closes: #499729).
- - POI documentation manual is not built anymore (depends on Forrest)
- so remove corresponding doc-base and lintian override.
- - Strip MS Office files from upstream tarball (.ppt, .vsd & so)
- * Add myself to Uploaders
- * Update Standards-Version to 3.8.3:
- - Rename README.Debian-source to README.source to comply with policy
- - Add recommended get-orig-source target (with orig-tar.sh script)
- * Maven POMs:
- - Add a Build-Depends dependency on maven-repo-helper
- - Use mh_installpom and mh_installjar to install the POM and the jar to the
- Maven repository
- - Use maven-dist Ant target to generate all pom.xml files
- * Use quilt as patch system:
- - Add a Build-Depends on quilt
- - Refresh all patches
- - Use patchsys-quilt.mk in debian/rules
- - Describe patch system in debian/README.source
- * Install API documentation in /usr/share/doc/libjakarta-poi-java/api/
- * Update debian/copyright:
- - Update copyright years
- - Include detailled upstream Authors (from KEYS file)
- - Include GPLv3 copyright for a resource file of HDGF part of POI
-
- -- Damien Raude-Morvan <drazzib at drazzib.com> Thu, 27 Aug 2009 23:24:48 +0200
-
-libjakarta-poi-java (3.0.2.dfsg-2) unstable; urgency=low
-
- [ Matthias Klose ]
- * (Build-)depend on default-jre/-jdk.
-
- [ Torsten Werner ]
- * Add myself to Uploaders.
- * Add missing Depends: ${misc:Depends}.
- * Change debhelper compat level to 5.
- * Add Vcs-* and Homepage headers.
- * Update Standards-Version: 3.8.2.
- * Do no longer quote the full text of the Apache license.
- * Change Section: java.
-
- -- Torsten Werner <twerner at debian.org> Tue, 04 Aug 2009 22:17:13 +0200
-
-libjakarta-poi-java (3.0.2.dfsg-1) unstable; urgency=low
-
- * New upstream release.
- * Fixed debian/changelog to have proper copyright.
- * Delete empty directory from documentation.
- * Removed old entry from lintian overrides file.
-
- -- Michael Koch <konqueror at gmx.de> Thu, 14 Feb 2008 15:40:22 +0100
-
-libjakarta-poi-java (3.0.1.dfsg-2) unstable; urgency=low
-
- * Improved wtch file to remove '.dfsg' in debian version.
- * Updated Standards-Version to 3.7.3.
-
- -- Michael Koch <konqueror at gmx.de> Fri, 28 Dec 2007 11:23:11 +0100
-
-libjakarta-poi-java (3.0.1.dfsg-1) unstable; urgency=low
-
- * oops, of course we need to remove lib/*.jar and src/contrib/lib/* from the orig
-
- -- Rene Engelhard <rene at debian.org> Mon, 24 Sep 2007 19:24:21 +0200
-
-libjakarta-poi-java (3.0.1-2) unstable; urgency=low
-
- * Fix build for environments without locale set. Closes: #443034.
- * Removed Wolfgang from Uploaders and added myself.
-
- -- Michael Koch <konqueror at gmx.de> Tue, 18 Sep 2007 20:33:07 +0200
-
-libjakarta-poi-java (3.0.1-1) unstable; urgency=low
-
- * New upstream release (closes: #436974)
- * add myself to Uploaders
- * add watch file
-
- -- Rene Engelhard <rene at debian.org> Wed, 05 Sep 2007 00:27:43 +0200
-
-libjakarta-poi-java (2.5.1-3) unstable; urgency=low
-
- * Standards-Version: updated to 3.7.2, no change needed
- * built with java-gcj-compat-dev
- * no more run the tests (closes: #393151). I was able to run a lot of
- tests with java-gcj-compat, but got a problem 'cannot open
- display'. Maybe it'll be a problem with pbuilders.
- * removed the patches
-
- -- Arnaud Vandyck <avdyk at debian.org> Mon, 30 Oct 2006 14:19:36 +0100
-
-libjakarta-poi-java (2.5.1-2) unstable; urgency=low
-
- * Upload to unstable
-
- -- Wolfgang Baer <WBaer at gmx.de> Thu, 2 Feb 2006 15:37:06 +0100
-
-libjakarta-poi-java (2.5.1-1) experimental; urgency=low
-
- * New upstream release
- * Move to main - build with kaffe
- * Apache 2.0 License, adjusted debian/copyright
- * Move package to pkg-java-maintainers for comaintenance,
- added Christian Bayle and myself as uploaders
- * New build dependencies (some are also dependencies)
- libcommons-logging-java, liblog4j1.2-java, ant-optional, junit, cdbs,
- libxalan2-java, libcommons-beanutils-java, libcommons-lang-java
- * Added compat file for debhelper 4 compatibility
- * Updated README.Debian with information about different classpaths
- dependend on used jakarta-poi jar files (main, scratchpad, contrib)
- * Enabled and run unit tests
- * Register manual and api with doc-base
- * Standards-Version 3.6.2 (no changes)
-
- -- Wolfgang Baer <WBaer at gmx.de> Tue, 25 Oct 2005 21:12:16 +0200
-
-libjakarta-poi-java (1.10.0-4) unstable; urgency=high
-
- * Fixed FTBFS: Missing Build-Depends on 'ant' (Closes: #306750)
-
- -- Christian Bayle <bayle at debian.org> Thu, 28 Apr 2005 21:59:48 +0200
-
-libjakarta-poi-java (1.10.0-3) unstable; urgency=low
-
- * Missing comma in Build-Depends-Indep line of control file
- (Closes: bug#254881)
-
- -- Christian Bayle <bayle at debian.org> Thu, 24 Jun 2004 22:33:36 +0200
-
-libjakarta-poi-java (1.10.0-2) unstable; urgency=low
-
- * Removed depends on doc package (Closes: #202399)
-
- -- Christian Bayle <bayle at debian.org> Tue, 22 Jul 2003 22:03:01 +0200
-
-libjakarta-poi-java (1.10.0-1) unstable; urgency=low
-
- * Initial Release.
-
- -- Christian Bayle <bayle at debian.org> Sat, 5 Jul 2003 15:42:08 +0200
Copied: tags/libapache-poi-java/3.10.1-1/debian/changelog (from rev 18328, trunk/libapache-poi-java/debian/changelog)
===================================================================
--- tags/libapache-poi-java/3.10.1-1/debian/changelog (rev 0)
+++ tags/libapache-poi-java/3.10.1-1/debian/changelog 2014-08-28 21:48:49 UTC (rev 18329)
@@ -0,0 +1,232 @@
+libapache-poi-java (3.10.1-1) unstable; urgency=medium
+
+ * New upstream release (Fixes CVE-2014-3529 and CVE-2014-3574)
+ - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 28 Aug 2014 22:43:52 +0200
+
+libapache-poi-java (3.10-2) unstable; urgency=medium
+
+ * Fixed a test failure with Java 8
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 16 Jul 2014 13:51:22 +0200
+
+libapache-poi-java (3.10-1) unstable; urgency=medium
+
+ * New upstream release
+ - Refreshed the patches
+ - Build depend on junit4 instead of junit
+ - Added a patch disabling the code coverage report
+ * Standards-Version updated to 3.9.5 (no changes)
+ * Switch to debhelper level 9
+ * Use XZ compression for the upstream tarball
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 25 Feb 2014 15:17:18 +0100
+
+libapache-poi-java (3.9-1) unstable; urgency=low
+
+ [ Emmanuel Bourg ]
+ * New upstream release
+ - Refreshed the patches
+ - Removed poi-contrib.jar (merged into poi.jar and poi-examples.jar)
+ - Removed the unused dependencies on commons-beanutils, commons-lang
+ and xalan
+ - Added a dependency on libcommons-codec-java
+ - Added the new excelant component (Excel Ant tasks)
+ * Removed the patches 01_javac_encoding.patch and 02_classpath.patch
+ * Enabled the unit tests
+ * Added the classpath attribute in the manifests
+ * Enabled the ooxml modules (Closes: #658288)
+ - Removed the patch 03_no_ooxml.patch
+ - Updated debian/orig-tar.sh to fetch the OOXML schemas from the ECMA site
+ - Added a dependency on libxmlbeans-java
+ - Updated debian/copyright to document the license of the OOXML schemas
+ * debian/control:
+ - Updated Standards-Version to 3.9.4 (no changes)
+ - Use canonical URLs for the Vcs-* fields
+ - Removed Michael Koch from the uploaders (Closes: #654046)
+ - Improved the package description
+ * debian/rules: Improved the clean target
+ * Updated the debian/README.* files
+
+ [ tony mancill ]
+ * Update debian/copyright to DEP5 format; clarify license of
+ chunks_parse_cmds.tbl. (Closes: #659067)
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 09 Jul 2013 23:10:21 +0200
+
+libapache-poi-java (3.6+dfsg-2) unstable; urgency=low
+
+ * Rename package from jakarta-poi to apache-poi. Add appropriate Conflicts,
+ Replaces, and Provides.
+ * Keep some compatibility symlinks in /usr/share/java.
+ * Remove Java runtime from Depends.
+ * Switch to source format 3.0.
+ * Remove Christian from Uploaders list.
+ * Switch to debhelper level 7.
+ * Update Standards-Version: 3.9.2.
+
+ -- Torsten Werner <twerner at debian.org> Wed, 07 Sep 2011 22:08:56 +0200
+
+libjakarta-poi-java (3.6+dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ - refresh all patches
+ * Remove Arnaud Vandyck from Uploaders
+ * Fix debian/watch to track upstream tarballs naming changes
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Wed, 30 Dec 2009 23:18:25 +0100
+
+libjakarta-poi-java (3.5+dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ - 01_javac_encoding: refreshed
+ - 02_classpath: use Debian JAR for build
+ - 03_no_ooxml: disable ooxml module (use non-free JARs)
+ - 04_jar_names: strip DSTAMP for JARs filenames
+ * Update my email address
+ * debian/orig-tar.exclude: Update exclusion file list
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Thu, 01 Oct 2009 00:36:43 +0200
+
+libjakarta-poi-java (3.2+dfsg-1) unstable; urgency=low
+
+ * New upstream release (Closes: #499729).
+ - POI documentation manual is not built anymore (depends on Forrest)
+ so remove corresponding doc-base and lintian override.
+ - Strip MS Office files from upstream tarball (.ppt, .vsd & so)
+ * Add myself to Uploaders
+ * Update Standards-Version to 3.8.3:
+ - Rename README.Debian-source to README.source to comply with policy
+ - Add recommended get-orig-source target (with orig-tar.sh script)
+ * Maven POMs:
+ - Add a Build-Depends dependency on maven-repo-helper
+ - Use mh_installpom and mh_installjar to install the POM and the jar to the
+ Maven repository
+ - Use maven-dist Ant target to generate all pom.xml files
+ * Use quilt as patch system:
+ - Add a Build-Depends on quilt
+ - Refresh all patches
+ - Use patchsys-quilt.mk in debian/rules
+ - Describe patch system in debian/README.source
+ * Install API documentation in /usr/share/doc/libjakarta-poi-java/api/
+ * Update debian/copyright:
+ - Update copyright years
+ - Include detailled upstream Authors (from KEYS file)
+ - Include GPLv3 copyright for a resource file of HDGF part of POI
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Thu, 27 Aug 2009 23:24:48 +0200
+
+libjakarta-poi-java (3.0.2.dfsg-2) unstable; urgency=low
+
+ [ Matthias Klose ]
+ * (Build-)depend on default-jre/-jdk.
+
+ [ Torsten Werner ]
+ * Add myself to Uploaders.
+ * Add missing Depends: ${misc:Depends}.
+ * Change debhelper compat level to 5.
+ * Add Vcs-* and Homepage headers.
+ * Update Standards-Version: 3.8.2.
+ * Do no longer quote the full text of the Apache license.
+ * Change Section: java.
+
+ -- Torsten Werner <twerner at debian.org> Tue, 04 Aug 2009 22:17:13 +0200
+
+libjakarta-poi-java (3.0.2.dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fixed debian/changelog to have proper copyright.
+ * Delete empty directory from documentation.
+ * Removed old entry from lintian overrides file.
+
+ -- Michael Koch <konqueror at gmx.de> Thu, 14 Feb 2008 15:40:22 +0100
+
+libjakarta-poi-java (3.0.1.dfsg-2) unstable; urgency=low
+
+ * Improved wtch file to remove '.dfsg' in debian version.
+ * Updated Standards-Version to 3.7.3.
+
+ -- Michael Koch <konqueror at gmx.de> Fri, 28 Dec 2007 11:23:11 +0100
+
+libjakarta-poi-java (3.0.1.dfsg-1) unstable; urgency=low
+
+ * oops, of course we need to remove lib/*.jar and src/contrib/lib/* from the orig
+
+ -- Rene Engelhard <rene at debian.org> Mon, 24 Sep 2007 19:24:21 +0200
+
+libjakarta-poi-java (3.0.1-2) unstable; urgency=low
+
+ * Fix build for environments without locale set. Closes: #443034.
+ * Removed Wolfgang from Uploaders and added myself.
+
+ -- Michael Koch <konqueror at gmx.de> Tue, 18 Sep 2007 20:33:07 +0200
+
+libjakarta-poi-java (3.0.1-1) unstable; urgency=low
+
+ * New upstream release (closes: #436974)
+ * add myself to Uploaders
+ * add watch file
+
+ -- Rene Engelhard <rene at debian.org> Wed, 05 Sep 2007 00:27:43 +0200
+
+libjakarta-poi-java (2.5.1-3) unstable; urgency=low
+
+ * Standards-Version: updated to 3.7.2, no change needed
+ * built with java-gcj-compat-dev
+ * no more run the tests (closes: #393151). I was able to run a lot of
+ tests with java-gcj-compat, but got a problem 'cannot open
+ display'. Maybe it'll be a problem with pbuilders.
+ * removed the patches
+
+ -- Arnaud Vandyck <avdyk at debian.org> Mon, 30 Oct 2006 14:19:36 +0100
+
+libjakarta-poi-java (2.5.1-2) unstable; urgency=low
+
+ * Upload to unstable
+
+ -- Wolfgang Baer <WBaer at gmx.de> Thu, 2 Feb 2006 15:37:06 +0100
+
+libjakarta-poi-java (2.5.1-1) experimental; urgency=low
+
+ * New upstream release
+ * Move to main - build with kaffe
+ * Apache 2.0 License, adjusted debian/copyright
+ * Move package to pkg-java-maintainers for comaintenance,
+ added Christian Bayle and myself as uploaders
+ * New build dependencies (some are also dependencies)
+ libcommons-logging-java, liblog4j1.2-java, ant-optional, junit, cdbs,
+ libxalan2-java, libcommons-beanutils-java, libcommons-lang-java
+ * Added compat file for debhelper 4 compatibility
+ * Updated README.Debian with information about different classpaths
+ dependend on used jakarta-poi jar files (main, scratchpad, contrib)
+ * Enabled and run unit tests
+ * Register manual and api with doc-base
+ * Standards-Version 3.6.2 (no changes)
+
+ -- Wolfgang Baer <WBaer at gmx.de> Tue, 25 Oct 2005 21:12:16 +0200
+
+libjakarta-poi-java (1.10.0-4) unstable; urgency=high
+
+ * Fixed FTBFS: Missing Build-Depends on 'ant' (Closes: #306750)
+
+ -- Christian Bayle <bayle at debian.org> Thu, 28 Apr 2005 21:59:48 +0200
+
+libjakarta-poi-java (1.10.0-3) unstable; urgency=low
+
+ * Missing comma in Build-Depends-Indep line of control file
+ (Closes: bug#254881)
+
+ -- Christian Bayle <bayle at debian.org> Thu, 24 Jun 2004 22:33:36 +0200
+
+libjakarta-poi-java (1.10.0-2) unstable; urgency=low
+
+ * Removed depends on doc package (Closes: #202399)
+
+ -- Christian Bayle <bayle at debian.org> Tue, 22 Jul 2003 22:03:01 +0200
+
+libjakarta-poi-java (1.10.0-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Christian Bayle <bayle at debian.org> Sat, 5 Jul 2003 15:42:08 +0200
Deleted: tags/libapache-poi-java/3.10.1-1/debian/patches/01_disable-code-coverage.patch
===================================================================
--- trunk/libapache-poi-java/debian/patches/01_disable-code-coverage.patch 2014-07-15 13:47:35 UTC (rev 18257)
+++ tags/libapache-poi-java/3.10.1-1/debian/patches/01_disable-code-coverage.patch 2014-08-28 21:48:49 UTC (rev 18329)
@@ -1,110 +0,0 @@
-Description: Disables the code coverage report (Jacoco isn't available in Debian)
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/build.xml
-+++ b/build.xml
-@@ -719,9 +719,9 @@
- </taskdef>
- </target>
-
-- <target name="test" depends="compile,jacocotask,test-main,test-scratchpad,test-ooxml,test-excelant"
-+ <target name="test" depends="compile,test-main,test-scratchpad,test-ooxml,test-excelant"
- description="Tests main, scratchpad and ooxml"/>
-- <target name="test-all" depends="test,test-ooxml-lite,testcoveragereport"/>
-+ <target name="test-all" depends="test,test-ooxml-lite"/>
-
- <target name="testcoveragereport" depends="jacocotask" description="create test-report" xmlns:jacoco="antlib:org.jacoco.ant" if="coverage.enabled">
- <delete dir="${coverage.dir}"/>
-@@ -793,8 +793,7 @@
- </target>
-
- <target name="test-main" unless="main.test.notRequired"
-- depends="compile-main, -test-main-check,jacocotask" xmlns:jacoco="antlib:org.jacoco.ant">
-- <jacoco:coverage enabled="${coverage.enabled}" excludes="${coverage.excludes}" destfile="build/jacoco-main.exec">
-+ depends="compile-main, -test-main-check">
- <junit fork="yes" forkmode="once" printsummary="yes" haltonfailure="${halt.on.test.failure}"
- failureproperty="main.test.failed" showoutput="true">
- <classpath refid="test.classpath"/>
-@@ -813,7 +812,6 @@
- </fileset>
- </batchtest>
- </junit>
-- </jacoco:coverage>
- <delete file="${main.testokfile}"/>
- <antcall target="-test-main-write-testfile"/>
- </target>
-@@ -834,9 +832,8 @@
- </uptodate>
- </target>
-
-- <target name="test-scratchpad" depends="compile-main,compile-scratchpad,-test-scratchpad-check,jacocotask"
-- unless="scratchpad.test.notRequired" xmlns:jacoco="antlib:org.jacoco.ant">
-- <jacoco:coverage enabled="${coverage.enabled}" excludes="${coverage.excludes}" destfile="build/jacoco-scratchpad.exec">
-+ <target name="test-scratchpad" depends="compile-main,compile-scratchpad,-test-scratchpad-check"
-+ unless="scratchpad.test.notRequired">
- <junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="${halt.on.test.failure}"
- failureproperty="scratchpad.test.failed">
- <classpath refid="test.scratchpad.classpath"/>
-@@ -858,7 +855,6 @@
- </fileset>
- </batchtest>
- </junit>
-- </jacoco:coverage>
- <delete file="${scratchpad.testokfile}"/>
- <antcall target="-test-scratchpad-write-testfile"/>
- </target>
-@@ -874,11 +870,10 @@
- </uptodate>
- </target>
-
-- <macrodef name="ooxml-test-runner" xmlns:jacoco="antlib:org.jacoco.ant">
-+ <macrodef name="ooxml-test-runner">
- <attribute name="classpath"/>
- <attribute name="type"/>
- <sequential>
-- <jacoco:coverage enabled="${coverage.enabled}" excludes="${coverage.excludes}" destfile="build/jacoco-@{type}.exec">
- <junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="${halt.on.test.failure}"
- failureproperty="ooxml.test.failed">
- <classpath refid="@{classpath}"/>
-@@ -895,11 +890,10 @@
- </fileset>
- </batchtest>
- </junit>
-- </jacoco:coverage>
- </sequential>
- </macrodef>
-
-- <target name="test-ooxml" depends="compile-main,compile-ooxml,-test-ooxml-check,jacocotask" unless="ooxml.test.notRequired">
-+ <target name="test-ooxml" depends="compile-main,compile-ooxml,-test-ooxml-check" unless="ooxml.test.notRequired">
- <ooxml-test-runner classpath="test.ooxml.classpath" type="ooxml"/>
- <delete file="${ooxml.testokfile}"/>
- <antcall target="-test-ooxml-write-testfile"/>
-@@ -934,7 +928,7 @@
- </java>
- </target>
-
-- <target name="test-ooxml-lite" depends="jacocotask">
-+ <target name="test-ooxml-lite">
- <delete file="${ooxml.testokfile}"/>
- <echo message="Running ooxml tests against 'poi-ooxml-schemas'"/>
- <ooxml-test-runner classpath="ooxml-lite.classpath" type="ooxml-lite"/>
-@@ -951,9 +945,8 @@
- <echo file="${excelant.testokfile}" append="false" message="testok"/>
- </target>
-
-- <target name="test-excelant" depends="compile-excelant,-test-excelant-check,jacocotask"
-- unless="excelant.test.notRequired" xmlns:jacoco="antlib:org.jacoco.ant">
-- <jacoco:coverage enabled="${coverage.enabled}" excludes="${coverage.excludes}" destfile="build/jacoco-excelant.exec">
-+ <target name="test-excelant" depends="compile-excelant,-test-excelant-check"
-+ unless="excelant.test.notRequired">
- <junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="${halt.on.test.failure}"
- failureproperty="excelant.test.failed">
- <classpath refid="test.excelant.classpath"/>
-@@ -968,7 +961,6 @@
- </fileset>
- </batchtest>
- </junit>
-- </jacoco:coverage>
- <delete file="${excelant.testokfile}"/>
- <antcall target="-test-excelant-write-testfile"/>
- </target>
Copied: tags/libapache-poi-java/3.10.1-1/debian/patches/01_disable-code-coverage.patch (from rev 18328, trunk/libapache-poi-java/debian/patches/01_disable-code-coverage.patch)
===================================================================
--- tags/libapache-poi-java/3.10.1-1/debian/patches/01_disable-code-coverage.patch (rev 0)
+++ tags/libapache-poi-java/3.10.1-1/debian/patches/01_disable-code-coverage.patch 2014-08-28 21:48:49 UTC (rev 18329)
@@ -0,0 +1,110 @@
+Description: Disables the code coverage report (Jacoco isn't available in Debian)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -727,9 +727,9 @@
+ </taskdef>
+ </target>
+
+- <target name="test" depends="compile,jacocotask,test-main,test-scratchpad,test-ooxml,test-excelant"
++ <target name="test" depends="compile,test-main,test-scratchpad,test-ooxml,test-excelant"
+ description="Tests main, scratchpad and ooxml"/>
+- <target name="test-all" depends="test,test-ooxml-lite,testcoveragereport"/>
++ <target name="test-all" depends="test,test-ooxml-lite"/>
+
+ <target name="testcoveragereport" depends="jacocotask" description="create test-report" xmlns:jacoco="antlib:org.jacoco.ant" if="coverage.enabled">
+ <delete dir="${coverage.dir}"/>
+@@ -801,8 +801,7 @@
+ </target>
+
+ <target name="test-main" unless="main.test.notRequired"
+- depends="compile-main, -test-main-check,jacocotask" xmlns:jacoco="antlib:org.jacoco.ant">
+- <jacoco:coverage enabled="${coverage.enabled}" excludes="${coverage.excludes}" destfile="build/jacoco-main.exec">
++ depends="compile-main, -test-main-check">
+ <junit fork="yes" forkmode="once" printsummary="yes" haltonfailure="${halt.on.test.failure}"
+ failureproperty="main.test.failed" showoutput="true">
+ <classpath refid="test.classpath"/>
+@@ -821,7 +820,6 @@
+ </fileset>
+ </batchtest>
+ </junit>
+- </jacoco:coverage>
+ <delete file="${main.testokfile}"/>
+ <antcall target="-test-main-write-testfile"/>
+ </target>
+@@ -842,9 +840,8 @@
+ </uptodate>
+ </target>
+
+- <target name="test-scratchpad" depends="compile-main,compile-scratchpad,-test-scratchpad-check,jacocotask"
+- unless="scratchpad.test.notRequired" xmlns:jacoco="antlib:org.jacoco.ant">
+- <jacoco:coverage enabled="${coverage.enabled}" excludes="${coverage.excludes}" destfile="build/jacoco-scratchpad.exec">
++ <target name="test-scratchpad" depends="compile-main,compile-scratchpad,-test-scratchpad-check"
++ unless="scratchpad.test.notRequired">
+ <junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="${halt.on.test.failure}"
+ failureproperty="scratchpad.test.failed">
+ <classpath refid="test.scratchpad.classpath"/>
+@@ -866,7 +863,6 @@
+ </fileset>
+ </batchtest>
+ </junit>
+- </jacoco:coverage>
+ <delete file="${scratchpad.testokfile}"/>
+ <antcall target="-test-scratchpad-write-testfile"/>
+ </target>
+@@ -882,11 +878,10 @@
+ </uptodate>
+ </target>
+
+- <macrodef name="ooxml-test-runner" xmlns:jacoco="antlib:org.jacoco.ant">
++ <macrodef name="ooxml-test-runner">
+ <attribute name="classpath"/>
+ <attribute name="type"/>
+ <sequential>
+- <jacoco:coverage enabled="${coverage.enabled}" excludes="${coverage.excludes}" destfile="build/jacoco-@{type}.exec">
+ <junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="${halt.on.test.failure}"
+ failureproperty="ooxml.test.failed">
+ <classpath refid="@{classpath}"/>
+@@ -903,11 +898,10 @@
+ </fileset>
+ </batchtest>
+ </junit>
+- </jacoco:coverage>
+ </sequential>
+ </macrodef>
+
+- <target name="test-ooxml" depends="compile-main,compile-ooxml,-test-ooxml-check,jacocotask" unless="ooxml.test.notRequired">
++ <target name="test-ooxml" depends="compile-main,compile-ooxml,-test-ooxml-check" unless="ooxml.test.notRequired">
+ <ooxml-test-runner classpath="test.ooxml.classpath" type="ooxml"/>
+ <delete file="${ooxml.testokfile}"/>
+ <antcall target="-test-ooxml-write-testfile"/>
+@@ -942,7 +936,7 @@
+ </java>
+ </target>
+
+- <target name="test-ooxml-lite" depends="jacocotask">
++ <target name="test-ooxml-lite">
+ <delete file="${ooxml.testokfile}"/>
+ <echo message="Running ooxml tests against 'poi-ooxml-schemas'"/>
+ <ooxml-test-runner classpath="ooxml-lite.classpath" type="ooxml-lite"/>
+@@ -959,9 +953,8 @@
+ <echo file="${excelant.testokfile}" append="false" message="testok"/>
+ </target>
+
+- <target name="test-excelant" depends="compile-excelant,-test-excelant-check,jacocotask"
+- unless="excelant.test.notRequired" xmlns:jacoco="antlib:org.jacoco.ant">
+- <jacoco:coverage enabled="${coverage.enabled}" excludes="${coverage.excludes}" destfile="build/jacoco-excelant.exec">
++ <target name="test-excelant" depends="compile-excelant,-test-excelant-check"
++ unless="excelant.test.notRequired">
+ <junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="${halt.on.test.failure}"
+ failureproperty="excelant.test.failed">
+ <classpath refid="test.excelant.classpath"/>
+@@ -976,7 +969,6 @@
+ </fileset>
+ </batchtest>
+ </junit>
+- </jacoco:coverage>
+ <delete file="${excelant.testokfile}"/>
+ <antcall target="-test-excelant-write-testfile"/>
+ </target>
Deleted: tags/libapache-poi-java/3.10.1-1/debian/patches/04_jar_names.patch
===================================================================
--- trunk/libapache-poi-java/debian/patches/04_jar_names.patch 2014-07-15 13:47:35 UTC (rev 18257)
+++ tags/libapache-poi-java/3.10.1-1/debian/patches/04_jar_names.patch 2014-08-28 21:48:49 UTC (rev 18329)
@@ -1,45 +0,0 @@
-Description: remove ${DSTAMP} suffix added to JARs
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Forwarded: no
-Last-Update:2013-07-10
---- a/build.xml
-+++ b/build.xml
-@@ -1144,32 +1144,32 @@
- <attribute name="Implementation-Vendor-Id" value="org.apache.poi"/>
- <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
- </manifest>
-- <jar destfile="${dist.dir}/${jar.name}-${version.id}-${DSTAMP}.jar"
-+ <jar destfile="${dist.dir}/${jar.name}-${version.id}.jar"
- manifest="build/poi-manifest.mf">
- <fileset dir="${main.output.dir}"/>
- <metainf dir="legal/"/>
- </jar>
-- <jar destfile="${dist.dir}/${jar.name}-scratchpad-${version.id}-${DSTAMP}.jar"
-+ <jar destfile="${dist.dir}/${jar.name}-scratchpad-${version.id}.jar"
- manifest="build/poi-manifest.mf">
- <fileset dir="${scratchpad.output.dir}"/>
- <metainf dir="legal/"/>
- </jar>
-- <jar destfile="${dist.dir}/${jar.name}-ooxml-${version.id}-${DSTAMP}.jar"
-+ <jar destfile="${dist.dir}/${jar.name}-ooxml-${version.id}.jar"
- manifest="build/poi-manifest.mf">
- <fileset dir="${ooxml.output.dir}"/>
- <metainf dir="legal/"/>
- </jar>
-- <jar destfile="${dist.dir}/${jar.name}-examples-${version.id}-${DSTAMP}.jar"
-+ <jar destfile="${dist.dir}/${jar.name}-examples-${version.id}.jar"
- manifest="build/poi-manifest.mf">
- <fileset dir="${examples.output.dir}"/>
- <metainf dir="legal/"/>
- </jar>
-- <jar destfile="${dist.dir}/${jar.name}-ooxml-schemas-${version.id}-${DSTAMP}.jar"
-+ <jar destfile="${dist.dir}/${jar.name}-ooxml-schemas-${version.id}.jar"
- manifest="build/poi-manifest.mf">
- <fileset dir="${ooxml.lite.output.dir}"/>
- <metainf dir="legal/"/>
- </jar>
-- <jar destfile="${dist.dir}/${jar.name}-excelant-${version.id}-${DSTAMP}.jar"
-+ <jar destfile="${dist.dir}/${jar.name}-excelant-${version.id}.jar"
- manifest="build/poi-manifest.mf">
- <fileset dir="${excelant.output.dir}"/>
- <metainf dir="legal/"/>
Copied: tags/libapache-poi-java/3.10.1-1/debian/patches/04_jar_names.patch (from rev 18328, trunk/libapache-poi-java/debian/patches/04_jar_names.patch)
===================================================================
--- tags/libapache-poi-java/3.10.1-1/debian/patches/04_jar_names.patch (rev 0)
+++ tags/libapache-poi-java/3.10.1-1/debian/patches/04_jar_names.patch 2014-08-28 21:48:49 UTC (rev 18329)
@@ -0,0 +1,45 @@
+Description: remove ${DSTAMP} suffix added to JARs
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Forwarded: no
+Last-Update:2013-07-10
+--- a/build.xml
++++ b/build.xml
+@@ -1152,32 +1152,32 @@
+ <attribute name="Implementation-Vendor-Id" value="org.apache.poi"/>
+ <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
+ </manifest>
+- <jar destfile="${dist.dir}/${jar.name}-${version.id}-${DSTAMP}.jar"
++ <jar destfile="${dist.dir}/${jar.name}-${version.id}.jar"
+ manifest="build/poi-manifest.mf">
+ <fileset dir="${main.output.dir}"/>
+ <metainf dir="legal/"/>
+ </jar>
+- <jar destfile="${dist.dir}/${jar.name}-scratchpad-${version.id}-${DSTAMP}.jar"
++ <jar destfile="${dist.dir}/${jar.name}-scratchpad-${version.id}.jar"
+ manifest="build/poi-manifest.mf">
+ <fileset dir="${scratchpad.output.dir}"/>
+ <metainf dir="legal/"/>
+ </jar>
+- <jar destfile="${dist.dir}/${jar.name}-ooxml-${version.id}-${DSTAMP}.jar"
++ <jar destfile="${dist.dir}/${jar.name}-ooxml-${version.id}.jar"
+ manifest="build/poi-manifest.mf">
+ <fileset dir="${ooxml.output.dir}"/>
+ <metainf dir="legal/"/>
+ </jar>
+- <jar destfile="${dist.dir}/${jar.name}-examples-${version.id}-${DSTAMP}.jar"
++ <jar destfile="${dist.dir}/${jar.name}-examples-${version.id}.jar"
+ manifest="build/poi-manifest.mf">
+ <fileset dir="${examples.output.dir}"/>
+ <metainf dir="legal/"/>
+ </jar>
+- <jar destfile="${dist.dir}/${jar.name}-ooxml-schemas-${version.id}-${DSTAMP}.jar"
++ <jar destfile="${dist.dir}/${jar.name}-ooxml-schemas-${version.id}.jar"
+ manifest="build/poi-manifest.mf">
+ <fileset dir="${ooxml.lite.output.dir}"/>
+ <metainf dir="legal/"/>
+ </jar>
+- <jar destfile="${dist.dir}/${jar.name}-excelant-${version.id}-${DSTAMP}.jar"
++ <jar destfile="${dist.dir}/${jar.name}-excelant-${version.id}.jar"
+ manifest="build/poi-manifest.mf">
+ <fileset dir="${excelant.output.dir}"/>
+ <metainf dir="legal/"/>
Deleted: tags/libapache-poi-java/3.10.1-1/debian/patches/05_use-local-ooxml-xsds.patch
===================================================================
--- trunk/libapache-poi-java/debian/patches/05_use-local-ooxml-xsds.patch 2014-07-15 13:47:35 UTC (rev 18257)
+++ tags/libapache-poi-java/3.10.1-1/debian/patches/05_use-local-ooxml-xsds.patch 2014-08-28 21:48:49 UTC (rev 18329)
@@ -1,31 +0,0 @@
-Description: Patch to use the local OOXML schema instead of fetching the files from the ECMA site at build time
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/build.xml
-+++ b/build.xml
-@@ -466,7 +466,7 @@
- </or>
- </condition>
- </target>
-- <target name="compile-ooxml-xsds" unless="ooxml-compiled-xsds.present"
-+ <target name="compile-ooxml-xsds"
- depends="check-jars,fetch-jars,check-compiled-ooxml-xsds"
- description="Unpacks the OOXML xsd files, and compiles them into XmlBeans">
- <property name="ooxml.xsds.tmp.dir" location="build/ooxml-xsds"/>
-@@ -483,7 +483,6 @@
- <equals arg1="${sun.arch.data.model}" arg2="64" />
- </condition>
-
-- <unzip src="${ooxml.xsds.izip}" dest="${ooxml.xsds.tmp.dir}"/>
- <!--
- schema="build/ooxml-xsds/"
- schema="build/ooxml-xsds/sml-workbook.xsd"
-@@ -508,7 +507,7 @@
- />
- </target>
-
-- <target name="compile-ooxml-encryption-xsds" unless="ooxml-compiled-encryption-xsds.present"
-+ <target name="compile-ooxml-encryption-xsds"
- depends="check-jars,fetch-jars,check-compiled-ooxml-xsds"
- description="Compiles the OOXML encryption xsd files into XmlBeans">
- <taskdef name="xmlbean"
Copied: tags/libapache-poi-java/3.10.1-1/debian/patches/05_use-local-ooxml-xsds.patch (from rev 18328, trunk/libapache-poi-java/debian/patches/05_use-local-ooxml-xsds.patch)
===================================================================
--- tags/libapache-poi-java/3.10.1-1/debian/patches/05_use-local-ooxml-xsds.patch (rev 0)
+++ tags/libapache-poi-java/3.10.1-1/debian/patches/05_use-local-ooxml-xsds.patch 2014-08-28 21:48:49 UTC (rev 18329)
@@ -0,0 +1,31 @@
+Description: Patch to use the local OOXML schema instead of fetching the files from the ECMA site at build time
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -474,7 +474,7 @@
+ </or>
+ </condition>
+ </target>
+- <target name="compile-ooxml-xsds" unless="ooxml-compiled-xsds.present"
++ <target name="compile-ooxml-xsds"
+ depends="check-jars,fetch-jars,check-compiled-ooxml-xsds"
+ description="Unpacks the OOXML xsd files, and compiles them into XmlBeans">
+ <property name="ooxml.xsds.tmp.dir" location="build/ooxml-xsds"/>
+@@ -491,7 +491,6 @@
+ <equals arg1="${sun.arch.data.model}" arg2="64" />
+ </condition>
+
+- <unzip src="${ooxml.xsds.izip}" dest="${ooxml.xsds.tmp.dir}"/>
+ <!--
+ schema="build/ooxml-xsds/"
+ schema="build/ooxml-xsds/sml-workbook.xsd"
+@@ -516,7 +515,7 @@
+ />
+ </target>
+
+- <target name="compile-ooxml-encryption-xsds" unless="ooxml-compiled-encryption-xsds.present"
++ <target name="compile-ooxml-encryption-xsds"
+ depends="check-jars,fetch-jars,check-compiled-ooxml-xsds"
+ description="Compiles the OOXML encryption xsd files into XmlBeans">
+ <taskdef name="xmlbean"
Copied: tags/libapache-poi-java/3.10.1-1/debian/patches/06_java8-compatibility.patch (from rev 18258, trunk/libapache-poi-java/debian/patches/06_java8-compatibility.patch)
===================================================================
--- tags/libapache-poi-java/3.10.1-1/debian/patches/06_java8-compatibility.patch (rev 0)
+++ tags/libapache-poi-java/3.10.1-1/debian/patches/06_java8-compatibility.patch 2014-08-28 21:48:49 UTC (rev 18329)
@@ -0,0 +1,14 @@
+Description: Fixes a build failure with Java 8
+Origin: upstream, https://svn.apache.org/r1575563
+--- a/src/java/org/apache/poi/ss/util/DateFormatConverter.java
++++ b/src/java/org/apache/poi/ss/util/DateFormatConverter.java
+@@ -322,6 +322,9 @@
+ result.put( "ga_ie", "[$-83C]" );
+ result.put( "in", "[$-0421]" );
+ result.put( "iw", "[$-40D]" );
++
++ // JDK 8 adds an empty locale-string, see also https://issues.apache.org/jira/browse/LANG-941
++ result.put( "", "[$-0409]" );
+
+ return result;
+ }
Deleted: tags/libapache-poi-java/3.10.1-1/debian/patches/series
===================================================================
--- trunk/libapache-poi-java/debian/patches/series 2014-07-15 13:47:35 UTC (rev 18257)
+++ tags/libapache-poi-java/3.10.1-1/debian/patches/series 2014-08-28 21:48:49 UTC (rev 18329)
@@ -1,3 +0,0 @@
-01_disable-code-coverage.patch
-04_jar_names.patch
-05_use-local-ooxml-xsds.patch
Copied: tags/libapache-poi-java/3.10.1-1/debian/patches/series (from rev 18258, trunk/libapache-poi-java/debian/patches/series)
===================================================================
--- tags/libapache-poi-java/3.10.1-1/debian/patches/series (rev 0)
+++ tags/libapache-poi-java/3.10.1-1/debian/patches/series 2014-08-28 21:48:49 UTC (rev 18329)
@@ -0,0 +1,4 @@
+01_disable-code-coverage.patch
+04_jar_names.patch
+05_use-local-ooxml-xsds.patch
+06_java8-compatibility.patch
More information about the pkg-java-commits
mailing list