[pkg-java] r17813 - in trunk/libapache-poi-java/debian: . patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Feb 25 14:18:15 UTC 2014
Author: ebourg-guest
Date: 2014-02-25 14:18:15 +0000 (Tue, 25 Feb 2014)
New Revision: 17813
Added:
trunk/libapache-poi-java/debian/patches/01_disable-code-coverage.patch
Modified:
trunk/libapache-poi-java/debian/ant.properties
trunk/libapache-poi-java/debian/changelog
trunk/libapache-poi-java/debian/control
trunk/libapache-poi-java/debian/orig-tar.sh
trunk/libapache-poi-java/debian/patches/04_jar_names.patch
trunk/libapache-poi-java/debian/patches/05_use-local-ooxml-xsds.patch
trunk/libapache-poi-java/debian/patches/series
trunk/libapache-poi-java/debian/rules
trunk/libapache-poi-java/debian/watch
Log:
New upstream release (3.10)
Refreshed the patches
Build depend on junit4 instead of junit
Added a patch disabling the code coverage report
Modified: trunk/libapache-poi-java/debian/ant.properties
===================================================================
--- trunk/libapache-poi-java/debian/ant.properties 2014-02-25 00:27:59 UTC (rev 17812)
+++ trunk/libapache-poi-java/debian/ant.properties 2014-02-25 14:18:15 UTC (rev 17813)
@@ -5,7 +5,7 @@
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/junit.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
Modified: trunk/libapache-poi-java/debian/changelog
===================================================================
--- trunk/libapache-poi-java/debian/changelog 2014-02-25 00:27:59 UTC (rev 17812)
+++ trunk/libapache-poi-java/debian/changelog 2014-02-25 14:18:15 UTC (rev 17813)
@@ -1,10 +1,14 @@
-libapache-poi-java (3.9-2) UNRELEASED; urgency=medium
+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, 18 Feb 2014 00:13:18 +0100
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 25 Feb 2014 15:17:18 +0100
libapache-poi-java (3.9-1) unstable; urgency=low
Modified: trunk/libapache-poi-java/debian/control
===================================================================
--- trunk/libapache-poi-java/debian/control 2014-02-25 00:27:59 UTC (rev 17812)
+++ trunk/libapache-poi-java/debian/control 2014-02-25 14:18:15 UTC (rev 17813)
@@ -12,7 +12,7 @@
debhelper (>= 9),
default-jdk,
javahelper,
- junit,
+ junit4,
libcommons-codec-java,
libcommons-logging-java,
libdom4j-java,
Modified: trunk/libapache-poi-java/debian/orig-tar.sh
===================================================================
--- trunk/libapache-poi-java/debian/orig-tar.sh 2014-02-25 00:27:59 UTC (rev 17812)
+++ trunk/libapache-poi-java/debian/orig-tar.sh 2014-02-25 14:18:15 UTC (rev 17813)
@@ -4,7 +4,7 @@
DIR=apache-poi-$VERSION
TAR=../libapache-poi-java_$VERSION.orig.tar.xz
-TAG=REL_`echo $VERSION | sed "s/\./_/"`
+TAG=REL_`echo $VERSION | sed "s/\./_/g"`
# Checkout the code from svn
svn export http://svn.apache.org/repos/asf/poi/tags/$TAG $DIR
Added: trunk/libapache-poi-java/debian/patches/01_disable-code-coverage.patch
===================================================================
--- trunk/libapache-poi-java/debian/patches/01_disable-code-coverage.patch (rev 0)
+++ trunk/libapache-poi-java/debian/patches/01_disable-code-coverage.patch 2014-02-25 14:18:15 UTC (rev 17813)
@@ -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
+@@ -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>
Modified: trunk/libapache-poi-java/debian/patches/04_jar_names.patch
===================================================================
--- trunk/libapache-poi-java/debian/patches/04_jar_names.patch 2014-02-25 00:27:59 UTC (rev 17812)
+++ trunk/libapache-poi-java/debian/patches/04_jar_names.patch 2014-02-25 14:18:15 UTC (rev 17813)
@@ -4,7 +4,7 @@
Last-Update:2013-07-10
--- a/build.xml
+++ b/build.xml
-@@ -958,32 +958,32 @@
+@@ -1144,32 +1144,32 @@
<attribute name="Implementation-Vendor-Id" value="org.apache.poi"/>
<attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
</manifest>
Modified: trunk/libapache-poi-java/debian/patches/05_use-local-ooxml-xsds.patch
===================================================================
--- trunk/libapache-poi-java/debian/patches/05_use-local-ooxml-xsds.patch 2014-02-25 00:27:59 UTC (rev 17812)
+++ trunk/libapache-poi-java/debian/patches/05_use-local-ooxml-xsds.patch 2014-02-25 14:18:15 UTC (rev 17813)
@@ -3,7 +3,7 @@
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -401,7 +401,7 @@
+@@ -466,7 +466,7 @@
</or>
</condition>
</target>
@@ -12,7 +12,7 @@
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"/>
-@@ -418,7 +418,6 @@
+@@ -483,7 +483,6 @@
<equals arg1="${sun.arch.data.model}" arg2="64" />
</condition>
@@ -20,3 +20,12 @@
<!--
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"
Modified: trunk/libapache-poi-java/debian/patches/series
===================================================================
--- trunk/libapache-poi-java/debian/patches/series 2014-02-25 00:27:59 UTC (rev 17812)
+++ trunk/libapache-poi-java/debian/patches/series 2014-02-25 14:18:15 UTC (rev 17813)
@@ -1,2 +1,3 @@
+01_disable-code-coverage.patch
04_jar_names.patch
05_use-local-ooxml-xsds.patch
Modified: trunk/libapache-poi-java/debian/rules
===================================================================
--- trunk/libapache-poi-java/debian/rules 2014-02-25 00:27:59 UTC (rev 17812)
+++ trunk/libapache-poi-java/debian/rules 2014-02-25 14:18:15 UTC (rev 17813)
@@ -13,7 +13,7 @@
JAVA_HOME := /usr/lib/jvm/default-java
ANT_HOME := /usr/share/ant
-DEB_JARS := ant ant-junit
+DEB_JARS := ant ant-junit ant-junit4
DEB_ANT_BUILD_TARGET := jar maven-poms javadocs
DEB_ANT_CHECK_TARGET := test
#DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt
Modified: trunk/libapache-poi-java/debian/watch
===================================================================
--- trunk/libapache-poi-java/debian/watch 2014-02-25 00:27:59 UTC (rev 17812)
+++ trunk/libapache-poi-java/debian/watch 2014-02-25 14:18:15 UTC (rev 17813)
@@ -1,2 +1,2 @@
version=3
-http://archive.apache.org/dist/poi/release/src/poi-src-([\d\.]*)-(?:.*).*.tar.gz
+http://archive.apache.org/dist/poi/release/src/poi-src-([\d\.]*)-(?:.*).*.tar.gz debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list