[pkg-java] r10714 - in trunk/libjakarta-poi-java/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Wed Sep 30 22:37:07 UTC 2009
Author: drazzib
Date: 2009-09-30 22:37:07 +0000 (Wed, 30 Sep 2009)
New Revision: 10714
Added:
trunk/libjakarta-poi-java/debian/patches/02_classpath.patch
trunk/libjakarta-poi-java/debian/patches/03_no_ooxml.patch
trunk/libjakarta-poi-java/debian/patches/04_jar_names.patch
Modified:
trunk/libjakarta-poi-java/debian/ant.properties
trunk/libjakarta-poi-java/debian/changelog
trunk/libjakarta-poi-java/debian/control
trunk/libjakarta-poi-java/debian/orig-tar.exclude
trunk/libjakarta-poi-java/debian/patches/01_javac_encoding.patch
trunk/libjakarta-poi-java/debian/patches/series
trunk/libjakarta-poi-java/debian/rules
Log:
* 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
Modified: trunk/libjakarta-poi-java/debian/ant.properties
===================================================================
--- trunk/libjakarta-poi-java/debian/ant.properties 2009-09-30 22:13:59 UTC (rev 10713)
+++ trunk/libjakarta-poi-java/debian/ant.properties 2009-09-30 22:37:07 UTC (rev 10714)
@@ -1,10 +1,6 @@
disconnected=true
jars.present=true
halt.on.test.failure=false
-main.jar1.dir=/usr/share/java/commons-logging.jar
-main.jar2.dir=/usr/share/java/log4j-1.2.jar
-junit.jar1.dir=/usr/share/java/junit.jar
-contrib.jar1.dir=/usr/share/java/commons-beanutils.jar
-# commented out as not required for compilation
-#contrib.jar2.dir=/usr/share/java/commons-collections.jar
-contrib.jar3.dir=/usr/share/java/commons-lang.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
Modified: trunk/libjakarta-poi-java/debian/changelog
===================================================================
--- trunk/libjakarta-poi-java/debian/changelog 2009-09-30 22:13:59 UTC (rev 10713)
+++ trunk/libjakarta-poi-java/debian/changelog 2009-09-30 22:37:07 UTC (rev 10714)
@@ -1,3 +1,15 @@
+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).
Modified: trunk/libjakarta-poi-java/debian/control
===================================================================
--- trunk/libjakarta-poi-java/debian/control 2009-09-30 22:13:59 UTC (rev 10713)
+++ trunk/libjakarta-poi-java/debian/control 2009-09-30 22:37:07 UTC (rev 10714)
@@ -2,7 +2,7 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Christian Bayle <bayle at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Rene Engelhard <rene at debian.org>, Michael Koch <konqueror at gmx.de>, Torsten Werner <twerner at debian.org>, Damien Raude-Morvan <drazzib at drazzib.com>
+Uploaders: Christian Bayle <bayle at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Rene Engelhard <rene at debian.org>, Michael Koch <konqueror at gmx.de>, Torsten Werner <twerner at debian.org>, Damien Raude-Morvan <drazzib at debian.org>
Build-Depends: debhelper (>= 5), cdbs, ant, ant-optional, junit, default-jdk, libcommons-logging-java, liblog4j1.2-java, libxalan2-java, libcommons-beanutils-java, libcommons-lang-java, quilt, maven-repo-helper
Standards-Version: 3.8.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjakarta-poi-java
Modified: trunk/libjakarta-poi-java/debian/orig-tar.exclude
===================================================================
--- trunk/libjakarta-poi-java/debian/orig-tar.exclude 2009-09-30 22:13:59 UTC (rev 10713)
+++ trunk/libjakarta-poi-java/debian/orig-tar.exclude 2009-09-30 22:37:07 UTC (rev 10714)
@@ -1,11 +1,12 @@
lib/*
docs/*
-src/contrib/poi-ruby/*.jar
+test-data/*
*.jar
*.ppt
*.pptx
*.doc
*.docx
+*.dotx
*.xls
*.xlsx
*.vsd
Modified: trunk/libjakarta-poi-java/debian/patches/01_javac_encoding.patch
===================================================================
--- trunk/libjakarta-poi-java/debian/patches/01_javac_encoding.patch 2009-09-30 22:13:59 UTC (rev 10713)
+++ trunk/libjakarta-poi-java/debian/patches/01_javac_encoding.patch 2009-09-30 22:37:07 UTC (rev 10714)
@@ -1,14 +1,17 @@
Description: set encoding of each call to "javac" when compiling source code
+Author: Damien Raude-Morvan <drazzib at debian.org>
Forwarded: no
-Last-Update:2009-08-28
+Last-Update:2009-10-01
--- a/build.xml
+++ b/build.xml
-@@ -274,12 +274,12 @@
+@@ -431,13 +431,14 @@
+ <fileset dir="${main.resource1.dir}"/>
</copy>
<javac target="${jdk.version.class}" source="${jdk.version.source}"
- failonerror="true" destdir="${main.output.dir}" debug="on" fork="yes"
-- srcdir="${main.src}">
-+ srcdir="${main.src}" encoding="iso-8859-1">
+- failonerror="true" destdir="${main.output.dir}" debug="on" fork="yes">
++ failonerror="true" destdir="${main.output.dir}" debug="on" fork="yes"
++ encoding="iso-8859-1">
+ <src path="${main.src}" />
<classpath refid="main.classpath"/>
</javac>
<javac target="${jdk.version.class}" source="${jdk.version.source}"
@@ -17,13 +20,13 @@
+ fork="yes" srcdir="${main.src.test}" encoding="iso-8859-1">
<classpath>
<path refid="main.classpath"/>
- <pathelement location="${main.output.dir}"/>
-@@ -291,12 +291,12 @@
+ <pathelement path="${main.output.dir}"/>
+@@ -449,12 +450,12 @@
<target name="compile-scratchpad" depends="init,compile-main">
<javac target="${jdk.version.class}" source="${jdk.version.source}"
failonerror="true" destdir="${scratchpad.output.dir}" debug="on"
- fork="yes" srcdir="${scratchpad.src}">
-+ fork="yes" srcdir="${scratchpad.src}" encoding="iso-8859-1">
++ fork="yes" srcdir="${scratchpad.src}" encoding="iso-8859-1">
<classpath refid="scratchpad.classpath"/>
</javac>
<javac target="${jdk.version.class}" source="${jdk.version.source}"
@@ -33,7 +36,7 @@
<classpath>
<path refid="scratchpad.classpath"/>
<pathelement location="${main.output.test.dir}"/>
-@@ -323,12 +323,12 @@
+@@ -481,12 +482,12 @@
<target name="compile-contrib" depends="init">
<javac target="${jdk.version.class}" source="${jdk.version.source}"
failonerror="true" destdir="${contrib.output.dir}" debug="on" fork="yes"
@@ -47,13 +50,40 @@
+ fork="yes" srcdir="${contrib.src.test}" encoding="iso-8859-1">
<classpath>
<path refid="contrib.classpath"/>
- <pathelement location="${contrib.output.dir}"/>
-@@ -339,7 +339,7 @@
+ <pathelement path="${contrib.output.dir}"/>
+@@ -498,7 +499,7 @@
+ <target name="compile-examples" depends="init,compile-ooxml">
+ <javac target="${jdk.version.class}" source="${jdk.version.source}"
+ failonerror="true" destdir="${examples.output.dir}" debug="on" fork="yes"
+- srcdir="${examples.src}">
++ srcdir="${examples.src}" encoding="iso-8859-1">
+ <classpath>
+ <path refid="examples.classpath"/>
+ <path refid="ooxml.classpath"/>
+@@ -510,13 +511,15 @@
- <target name="compile-examples" depends="init">
+ <target name="compile-ooxml" depends="init, compile-main, compile-scratchpad">
+ <javac target="1.5" source="1.5"
+- destdir="${ooxml.output.dir}" debug="on" srcdir="${ooxml.src}">
++ destdir="${ooxml.output.dir}" debug="on" srcdir="${ooxml.src}"
++ encoding="iso-8859-1">
+ <classpath refid="ooxml.classpath"/>
+ </javac>
+
+ <javac target="1.5" source="1.5"
+ failonerror="true" destdir="${ooxml.output.test.dir}" debug="on"
+- fork="yes" srcdir="${ooxml.src.test}">
++ fork="yes" srcdir="${ooxml.src.test}"
++ encoding="iso-8859-1">
+ <classpath>
+ <path refid="ooxml.classpath"/>
+ <pathelement path="${ooxml.output.dir}"/>
+@@ -544,7 +547,7 @@
+ <!-- Compile -->
<javac target="${jdk.version.class}" source="${jdk.version.source}"
-- destdir="${examples.output.dir}" debug="on" srcdir="${examples.src}">
-+ destdir="${examples.output.dir}" debug="on" srcdir="${examples.src}" encoding="iso-8859-1">
- <classpath refid="examples.classpath"/>
- </javac>
+ failonerror="true" destdir="${main.output.dir}" debug="on" fork="yes"
+- srcdir="${main.output.dir}" />
++ srcdir="${main.output.dir}" encoding="iso-8859-1"/>
+ <!-- Tidy up -->
+ <delete file="${version.java}" />
</target>
Added: trunk/libjakarta-poi-java/debian/patches/02_classpath.patch
===================================================================
--- trunk/libjakarta-poi-java/debian/patches/02_classpath.patch (rev 0)
+++ trunk/libjakarta-poi-java/debian/patches/02_classpath.patch 2009-09-30 22:37:07 UTC (rev 10714)
@@ -0,0 +1,19 @@
+Description: define classpath of build (using properties from
+ debian/ant.properties)
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Forwarded: no
+Last-Update:2009-10-01
+--- a/build.xml
++++ b/build.xml
+@@ -158,9 +158,8 @@
+ description="JDK version of generated class files"/>
+
+ <path id="main.classpath">
+- <fileset dir="${main.lib}">
+- <include name="*.jar"/>
+- </fileset>
++ <pathelement location="${main.commons-logging.jar}"/>
++ <pathelement location="${main.log4j.jar}"/>
+ <pathelement location="${main.resource1.dir}"/>
+ </path>
+
Added: trunk/libjakarta-poi-java/debian/patches/03_no_ooxml.patch
===================================================================
--- trunk/libjakarta-poi-java/debian/patches/03_no_ooxml.patch (rev 0)
+++ trunk/libjakarta-poi-java/debian/patches/03_no_ooxml.patch 2009-09-30 22:37:07 UTC (rev 10714)
@@ -0,0 +1,16 @@
+Description: disable build of "example" and "ooxml" modules
+ ooxml depends on non-DFSG-free jars.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Forwarded: no
+Last-Update:2009-10-01
+--- a/build.xml
++++ b/build.xml
+@@ -422,7 +422,7 @@
+ </target>
+
+ <target name="compile" depends="init, compile-main,
+- compile-scratchpad, compile-contrib, compile-examples"
++ compile-scratchpad, compile-contrib"
+ description="Compiles the POI main classes, scratchpad, contrib, and examples"/>
+
+ <target name="compile-main">
Added: trunk/libjakarta-poi-java/debian/patches/04_jar_names.patch
===================================================================
--- trunk/libjakarta-poi-java/debian/patches/04_jar_names.patch (rev 0)
+++ trunk/libjakarta-poi-java/debian/patches/04_jar_names.patch 2009-09-30 22:37:07 UTC (rev 10714)
@@ -0,0 +1,42 @@
+Description: remove ${DSTAMP} suffix added to JARs
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Forwarded: no
+Last-Update:2009-10-01
+--- a/build.xml
++++ b/build.xml
+@@ -1012,7 +1012,7 @@
+ </target>
+
+ <target name="jar" depends="compile, compile-version" description="Creates jar files for distribution">
+- <jar destfile="${dist.dir}/${jar.name}-${version.id}-${DSTAMP}.jar">
++ <jar destfile="${dist.dir}/${jar.name}-${version.id}.jar">
+ <fileset dir="${main.output.dir}" />
+ <fileset dir="legal/" />
+ <manifest>
+@@ -1025,7 +1025,7 @@
+ <attribute name="Implementation-Vendor" value="Apache"/>
+ </manifest>
+ </jar>
+- <jar destfile="${dist.dir}/${jar.name}-contrib-${version.id}-${DSTAMP}.jar">
++ <jar destfile="${dist.dir}/${jar.name}-contrib-${version.id}.jar">
+ <fileset dir="${contrib.output.dir}" />
+ <fileset dir="legal/" />
+ <manifest>
+@@ -1038,7 +1038,7 @@
+ <attribute name="Implementation-Vendor" value="Apache"/>
+ </manifest>
+ </jar>
+- <jar destfile="${dist.dir}/${jar.name}-scratchpad-${version.id}-${DSTAMP}.jar">
++ <jar destfile="${dist.dir}/${jar.name}-scratchpad-${version.id}.jar">
+ <fileset dir="${scratchpad.output.dir}" />
+ <fileset dir="legal/" />
+ <manifest>
+@@ -1051,7 +1051,7 @@
+ <attribute name="Implementation-Vendor" value="Apache"/>
+ </manifest>
+ </jar>
+- <jar destfile="${dist.dir}/${jar.name}-ooxml-${version.id}-${DSTAMP}.jar">
++ <jar destfile="${dist.dir}/${jar.name}-ooxml-${version.id}.jar">
+ <fileset dir="${ooxml.output.dir}" />
+ <fileset dir="legal/" />
+ <manifest>
Modified: trunk/libjakarta-poi-java/debian/patches/series
===================================================================
--- trunk/libjakarta-poi-java/debian/patches/series 2009-09-30 22:13:59 UTC (rev 10713)
+++ trunk/libjakarta-poi-java/debian/patches/series 2009-09-30 22:37:07 UTC (rev 10714)
@@ -1 +1,4 @@
01_javac_encoding.patch
+02_classpath.patch
+03_no_ooxml.patch
+04_jar_names.patch
Modified: trunk/libjakarta-poi-java/debian/rules
===================================================================
--- trunk/libjakarta-poi-java/debian/rules 2009-09-30 22:13:59 UTC (rev 10713)
+++ trunk/libjakarta-poi-java/debian/rules 2009-09-30 22:37:07 UTC (rev 10714)
@@ -8,15 +8,15 @@
VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\- | sed -e s/\+dfsg//)
PACKAGE := jakarta-poi
-MAVEN_DIST := build/maven-dist/org.apache.poi
-POM_DIR := $(MAVEN_DIST)/poms
-JAR_DIR := $(MAVEN_DIST)/jars
+MAVEN_DIST := build/dist/
+POM_DIR := $(MAVEN_DIST)
+JAR_DIR := $(MAVEN_DIST)
JAVA_HOME := /usr/lib/jvm/default-java
ANT_HOME := /usr/share/ant
DEB_JARS := $(ANT_HOME)/lib/ant-junit.jar $(ANT_HOME)/lib/ant-nodeps.jar junit xalan2
-DEB_ANT_BUILD_TARGET := compile maven-dist javadocs
+DEB_ANT_BUILD_TARGET := compile maven-poms javadocs
#DEB_ANT_CHECK_TARGET := test
ANT_ARGS := -Dversion.id=$(VERSION)
More information about the pkg-java-commits
mailing list