[pkg-java] r11319 - in trunk/libjakarta-poi-java/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Wed Dec 30 22:10:04 UTC 2009
Author: drazzib
Date: 2009-12-30 22:10:04 +0000 (Wed, 30 Dec 2009)
New Revision: 11319
Modified:
trunk/libjakarta-poi-java/debian/changelog
trunk/libjakarta-poi-java/debian/orig-tar.sh
trunk/libjakarta-poi-java/debian/patches/01_javac_encoding.patch
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
trunk/libjakarta-poi-java/debian/rules
trunk/libjakarta-poi-java/debian/watch
Log:
* New upstream release.
- refresh all patches
* Fix debian/watch to track upstream tarballs naming changes
Modified: trunk/libjakarta-poi-java/debian/changelog
===================================================================
--- trunk/libjakarta-poi-java/debian/changelog 2009-12-30 21:22:10 UTC (rev 11318)
+++ trunk/libjakarta-poi-java/debian/changelog 2009-12-30 22:10:04 UTC (rev 11319)
@@ -1,8 +1,11 @@
-libjakarta-poi-java (3.5+dfsg-2) UNRELEASED; urgency=low
+libjakarta-poi-java (3.6+dfsg-1) UNRELEASED; 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> Mon, 07 Dec 2009 19:47:09 +0100
+ -- Damien Raude-Morvan <drazzib at debian.org> Wed, 30 Dec 2009 23:09:59 +0100
libjakarta-poi-java (3.5+dfsg-1) unstable; urgency=low
Modified: trunk/libjakarta-poi-java/debian/orig-tar.sh
===================================================================
--- trunk/libjakarta-poi-java/debian/orig-tar.sh 2009-12-30 21:22:10 UTC (rev 11318)
+++ trunk/libjakarta-poi-java/debian/orig-tar.sh 2009-12-30 22:10:04 UTC (rev 11319)
@@ -3,11 +3,10 @@
# $2 = version
# $3 = file
DIR=libjakarta-poi-java-$2.orig
-TAR=libjakarta-poi-java_$2.orig.tar.gz
+TAR=libjakarta-poi-java_$2+dfsg.orig.tar.gz
+TAG=REL_`echo $2 | sed "s/\./_/"`
-# clean up the upstream tarball
-tar zxf $3
-mv poi-* $DIR
+svn export http://svn.apache.org/repos/asf/poi/tags/$TAG $DIR
GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR
rm -rf $DIR
Modified: trunk/libjakarta-poi-java/debian/patches/01_javac_encoding.patch
===================================================================
--- trunk/libjakarta-poi-java/debian/patches/01_javac_encoding.patch 2009-12-30 21:22:10 UTC (rev 11318)
+++ trunk/libjakarta-poi-java/debian/patches/01_javac_encoding.patch 2009-12-30 22:10:04 UTC (rev 11319)
@@ -4,86 +4,93 @@
Last-Update:2009-10-01
--- a/build.xml
+++ b/build.xml
-@@ -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">
-+ 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}"
- failonerror="true" destdir="${main.output.test.dir}" debug="on"
-- fork="yes" srcdir="${main.src.test}">
-+ fork="yes" srcdir="${main.src.test}" encoding="iso-8859-1">
- <classpath>
- <path refid="main.classpath"/>
- <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">
- <classpath refid="scratchpad.classpath"/>
- </javac>
- <javac target="${jdk.version.class}" source="${jdk.version.source}"
- failonerror="true" destdir="${scratchpad.output.test.dir}" debug="on"
-- fork="yes" srcdir="${scratchpad.src.test}">
-+ fork="yes" srcdir="${scratchpad.src.test}" encoding="iso-8859-1">
- <classpath>
- <path refid="scratchpad.classpath"/>
- <pathelement location="${main.output.test.dir}"/>
-@@ -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"
-- srcdir="${contrib.src}">
-+ srcdir="${contrib.src}" encoding="iso-8859-1">
- <classpath refid="contrib.classpath"/>
- </javac>
- <javac target="${jdk.version.class}" source="${jdk.version.source}"
- failonerror="true" destdir="${contrib.output.test.dir}" debug="on"
-- fork="yes" srcdir="${contrib.src.test}">
-+ fork="yes" srcdir="${contrib.src.test}" encoding="iso-8859-1">
- <classpath>
- <path refid="contrib.classpath"/>
- <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-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}"
- 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>
+@@ -423,7 +423,7 @@
+ destdir="${main.output.dir}"
+ srcdir="${main.src}"
+ debug="${compile.debug}"
+- fork="yes">
++ fork="yes" encoding="iso-8859-1">
+ <classpath refid="main.classpath"/>
+ </javac>
+ <javac target="${jdk.version.class}"
+@@ -431,7 +431,7 @@
+ destdir="${main.output.test.dir}"
+ srcdir="${main.src.test}"
+ debug="${compile.debug}"
+- fork="yes">
++ fork="yes" encoding="iso-8859-1">
+ <classpath>
+ <path refid="main.classpath"/>
+ <pathelement path="${main.output.dir}"/>
+@@ -448,7 +448,7 @@
+ destdir="${scratchpad.output.dir}"
+ srcdir="${scratchpad.src}"
+ debug="${compile.debug}"
+- fork="yes">
++ fork="yes" encoding="iso-8859-1">
+ <classpath refid="scratchpad.classpath"/>
+ </javac>
+ <javac target="${jdk.version.class}"
+@@ -456,7 +456,7 @@
+ destdir="${scratchpad.output.test.dir}"
+ srcdir="${scratchpad.src.test}"
+ debug="${compile.debug}"
+- fork="yes">
++ fork="yes" encoding="iso-8859-1">
+ <classpath>
+ <path refid="scratchpad.classpath"/>
+ <pathelement location="${scratchpad.output.dir}"/>
+@@ -474,7 +474,7 @@
+ destdir="${contrib.output.dir}"
+ srcdir="${contrib.src}"
+ debug="${compile.debug}"
+- fork="yes">
++ fork="yes" encoding="iso-8859-1">
+ <classpath refid="contrib.classpath"/>
+ </javac>
+ <javac target="${jdk.version.class}"
+@@ -483,7 +483,7 @@
+ destdir="${contrib.output.test.dir}"
+ srcdir="${contrib.src.test}"
+ debug="${compile.debug}"
+- fork="yes">
++ fork="yes" encoding="iso-8859-1">
+ <classpath>
+ <path refid="contrib.classpath"/>
+ <pathelement path="${contrib.output.dir}"/>
+@@ -497,7 +497,7 @@
+ destdir="${examples.output.dir}"
+ srcdir="${examples.src}"
+ debug="${compile.debug}"
+- fork="yes">
++ fork="yes" encoding="iso-8859-1">
+ <classpath>
+ <path refid="ooxml.classpath"/>
+ <pathelement path="${ooxml.output.dir}"/>
+@@ -510,7 +510,7 @@
+ source="${jdk.version.source}"
+ destdir="${ooxml.output.dir}"
+ srcdir="${ooxml.src}"
+- debug="${compile.debug}">
++ debug="${compile.debug}" encoding="iso-8859-1">
+ <classpath refid="ooxml.classpath"/>
+ </javac>
+ <javac target="${jdk.version.class}"
+@@ -518,7 +518,7 @@
+ destdir="${ooxml.output.test.dir}"
+ srcdir="${ooxml.src.test}"
+ debug="${compile.debug}"
+- fork="yes">
++ fork="yes" encoding="iso-8859-1">
+ <classpath>
+ <path refid="ooxml.classpath"/>
+ <pathelement path="${ooxml.output.dir}"/>
+@@ -544,7 +544,7 @@
+ <!-- Compile -->
+ <javac target="${jdk.version.class}" source="${jdk.version.source}"
+ 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>
Modified: trunk/libjakarta-poi-java/debian/patches/02_classpath.patch
===================================================================
--- trunk/libjakarta-poi-java/debian/patches/02_classpath.patch 2009-12-30 21:22:10 UTC (rev 11318)
+++ trunk/libjakarta-poi-java/debian/patches/02_classpath.patch 2009-12-30 22:10:04 UTC (rev 11319)
@@ -5,15 +5,15 @@
Last-Update:2009-10-01
--- a/build.xml
+++ b/build.xml
-@@ -158,9 +158,8 @@
- description="JDK version of generated class files"/>
+@@ -166,9 +166,8 @@
+ </propertyset>
<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}"/>
+- <fileset dir="${main.lib}">
+- <include name="*.jar"/>
+- </fileset>
++ <pathelement location="${main.commons-logging.jar}"/>
++ <pathelement location="${main.log4j.jar}"/>
</path>
+ <path id="scratchpad.classpath">
Modified: trunk/libjakarta-poi-java/debian/patches/03_no_ooxml.patch
===================================================================
--- trunk/libjakarta-poi-java/debian/patches/03_no_ooxml.patch 2009-12-30 21:22:10 UTC (rev 11318)
+++ trunk/libjakarta-poi-java/debian/patches/03_no_ooxml.patch 2009-12-30 22:10:04 UTC (rev 11319)
@@ -2,15 +2,45 @@
ooxml depends on non-DFSG-free jars.
Author: Damien Raude-Morvan <drazzib at debian.org>
Forwarded: no
-Last-Update:2009-10-01
+Last-Update:2009-12-30
--- a/build.xml
+++ b/build.xml
-@@ -422,7 +422,7 @@
- </target>
+@@ -411,10 +411,10 @@
+ </target>
- <target name="compile" depends="init, compile-main,
+ <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"/>
+ description="Compiles the POI main classes, scratchpad, contrib and examples"/>
- <target name="compile-main">
+- <target name="compile-all" depends="compile,compile-ooxml-lite"/>
++ <target name="compile-all" depends="compile"/>
+
+ <target name="compile-main">
+ <javac target="${jdk.version.class}"
+@@ -895,21 +895,25 @@
+ <fileset dir="${scratchpad.output.dir}"/>
+ <metainf dir="legal/"/>
+ </jar>
++ <!--
+ <jar destfile="${dist.dir}/${jar.name}-ooxml-${version.id}-${DSTAMP}.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"
+ 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"
+ manifest="build/poi-manifest.mf">
+ <fileset dir="${ooxml.lite.output.dir}"/>
+ <metainf dir="legal/"/>
+ </jar>
++ -->
+ </target>
+
+ <target name="jar-src" description="Sources for Maven">
Modified: trunk/libjakarta-poi-java/debian/patches/04_jar_names.patch
===================================================================
--- trunk/libjakarta-poi-java/debian/patches/04_jar_names.patch 2009-12-30 21:22:10 UTC (rev 11318)
+++ trunk/libjakarta-poi-java/debian/patches/04_jar_names.patch 2009-12-30 22:10:04 UTC (rev 11319)
@@ -4,39 +4,45 @@
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>
+@@ -880,35 +880,35 @@
+ <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}-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 destfile="${dist.dir}/${jar.name}-contrib-${version.id}-${DSTAMP}.jar"
++ <jar destfile="${dist.dir}/${jar.name}-contrib-${version.id}.jar"
+ manifest="build/poi-manifest.mf">
+ <fileset dir="${contrib.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">
- <fileset dir="${scratchpad.output.dir}" />
- <fileset dir="legal/" />
- <manifest>
-@@ -1051,7 +1051,7 @@
- <attribute name="Implementation-Vendor" value="Apache"/>
- </manifest>
+- <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">
- <fileset dir="${ooxml.output.dir}" />
- <fileset dir="legal/" />
- <manifest>
+ <!--
+- <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/"/>
Modified: trunk/libjakarta-poi-java/debian/rules
===================================================================
--- trunk/libjakarta-poi-java/debian/rules 2009-12-30 21:22:10 UTC (rev 11318)
+++ trunk/libjakarta-poi-java/debian/rules 2009-12-30 22:10:04 UTC (rev 11319)
@@ -5,10 +5,10 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\- | sed -e s/\+dfsg//)
+VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/+dfsg//')
PACKAGE := jakarta-poi
-MAVEN_DIST := build/dist/
+MAVEN_DIST := build/dist
POM_DIR := $(MAVEN_DIST)
JAR_DIR := $(MAVEN_DIST)
@@ -16,7 +16,7 @@
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-poms javadocs
+DEB_ANT_BUILD_TARGET := jar maven-poms javadocs
#DEB_ANT_CHECK_TARGET := test
ANT_ARGS := -Dversion.id=$(VERSION)
@@ -34,4 +34,4 @@
mh_installjar -plib$(PACKAGE)-java -njakarta-scratchpad-poi -l $(POM_DIR)/poi-scratchpad-$(VERSION).pom $(JAR_DIR)/poi-scratchpad-$(VERSION).jar
get-orig-source:
- uscan --force-download
+ debian/orig-tar.sh --upstream-version $(VERSION)
Modified: trunk/libjakarta-poi-java/debian/watch
===================================================================
--- trunk/libjakarta-poi-java/debian/watch 2009-12-30 21:22:10 UTC (rev 11318)
+++ trunk/libjakarta-poi-java/debian/watch 2009-12-30 22:10:04 UTC (rev 11319)
@@ -1,3 +1,3 @@
version=3
opts=dversionmangle=s/\+dfsg$// \
- http://www.apache.org/dist/poi/release/src/poi-src-(.*)-FINAL-.*.tar.gz debian debian/orig-tar.sh
+ http://www.apache.org/dist/poi/release/src/poi-src-([\d\.]*)-(?:.*).*.tar.gz
More information about the pkg-java-commits
mailing list