Author: ebourg-guest Date: 2013-07-11 09:51:48 +0000 (Thu, 11 Jul 2013) New Revision: 17008
Added: trunk/libapache-poi-java/debian/patches/05_use-local-ooxml-xsds.patch Removed: trunk/libapache-poi-java/debian/patches/01_javac_encoding.patch trunk/libapache-poi-java/debian/patches/03_no_ooxml.patch Modified: trunk/libapache-poi-java/debian/README.Debian trunk/libapache-poi-java/debian/README.source trunk/libapache-poi-java/debian/ant.properties trunk/libapache-poi-java/debian/changelog trunk/libapache-poi-java/debian/control trunk/libapache-poi-java/debian/copyright trunk/libapache-poi-java/debian/links trunk/libapache-poi-java/debian/orig-tar.exclude trunk/libapache-poi-java/debian/orig-tar.sh trunk/libapache-poi-java/debian/patches/02_classpath.patch trunk/libapache-poi-java/debian/patches/04_jar_names.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.7) Enabled the OOXML component Modified: trunk/libapache-poi-java/debian/README.Debian =================================================================== --- trunk/libapache-poi-java/debian/README.Debian 2013-07-10 14:32:37 UTC (rev 17007) +++ trunk/libapache-poi-java/debian/README.Debian 2013-07-11 09:51:48 UTC (rev 17008) @@ -1,16 +1,10 @@ libapache-poi-java for Debian ----------------------------- -Apache POI consists of three jars in /usr/share/java: +Apache POI consists of four jars in /usr/share/java. They require additional +jars on the CLASSPATH to be used: -poi.jar -poi-scratchpad.jar -poi-contrib.jar - -For poi.jar and poi-scratchpad.jar a CLASSPATH with the jar files of -libcommons-logging-java, liblog4j1.2-java and libxalan2-java is enough. - -If you want to use the poi-contrib.jar you need to additionally include the jar -files of libcommons-beanutils-java and libcommons-lang-java into your CLASSPATH. - - -- Wolfgang Baer <[email protected]> Tue, 25 Oct 2005 21:12:16 +0200 + poi.jar (requires commons-logging.jar and log4j-1.2.jar) + poi-scratchpad.jar (requires poi.jar) + poi-ooxml-schemas.jar (requires xmlbeans.jar) + poi-ooxml.jar (requires poi.jar, poi-schemas.jar and dom4j.jar) Modified: trunk/libapache-poi-java/debian/README.source =================================================================== --- trunk/libapache-poi-java/debian/README.source 2013-07-10 14:32:37 UTC (rev 17007) +++ trunk/libapache-poi-java/debian/README.source 2013-07-11 09:51:48 UTC (rev 17008) @@ -10,11 +10,9 @@ Upstream tarball ================ -Upstream does not distribute source releases. Therefore -the upstream tarball was cleaned and repackaged. -Script to clean upstream tarball: -debian/orig-tar.sh --upstream-version X.Y+dfsg ../poi-X.Y.tar.gz - -Detail of elements stripped from upstream tarball are listed in +The upstream tarball needs additional elements downloaded from the Internet +to build the library. The debian/orig-tar.sh downloads and assembles them +into a single archive. It's invoked with the get-orig-source target of +debian/rules. Detail of elements stripped from upstream tarball are listed in debian/orig-tar.exclude Modified: trunk/libapache-poi-java/debian/ant.properties =================================================================== --- trunk/libapache-poi-java/debian/ant.properties 2013-07-10 14:32:37 UTC (rev 17007) +++ trunk/libapache-poi-java/debian/ant.properties 2013-07-11 09:51:48 UTC (rev 17008) @@ -1,6 +1,9 @@ disconnected=true jars.present=true -halt.on.test.failure=false +halt.on.test.failure=true 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 +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 2013-07-10 14:32:37 UTC (rev 17007) +++ trunk/libapache-poi-java/debian/changelog 2013-07-11 09:51:48 UTC (rev 17008) @@ -1,16 +1,31 @@ -libapache-poi-java (3.6+dfsg-3) UNRELEASED; urgency=low +libapache-poi-java (3.7-1) UNRELEASED; 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 + * Removed the patch 01_javac_encoding.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 ] - * Updated Standards-Version to 3.9.4 (no changes) - * Use canonical URLs for the Vcs-* fields - * Removed Michael Koch from the uploaders (Closes: #654046) - * debian/rules: Improved the clean target - * Added the upstream changelog - -- Emmanuel Bourg <[email protected]> Tue, 09 Jul 2013 23:10:21 +0200 libapache-poi-java (3.6+dfsg-2) unstable; urgency=low Modified: trunk/libapache-poi-java/debian/control =================================================================== --- trunk/libapache-poi-java/debian/control 2013-07-10 14:32:37 UTC (rev 17007) +++ trunk/libapache-poi-java/debian/control 2013-07-11 09:51:48 UTC (rev 17008) @@ -2,8 +2,22 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Rene Engelhard <[email protected]>, Torsten Werner <[email protected]>, Damien Raude-Morvan <[email protected]>, Emmanuel Bourg <[email protected]> -Build-Depends: debhelper (>= 7), cdbs, ant, ant-optional, junit, default-jdk, libcommons-logging-java, liblog4j1.2-java, libxalan2-java, libcommons-beanutils-java, libcommons-lang-java, maven-repo-helper +Uploaders: Rene Engelhard <[email protected]>, + Torsten Werner <[email protected]>, + Damien Raude-Morvan <[email protected]>, + Emmanuel Bourg <[email protected]> +Build-Depends: ant, + ant-optional, + cdbs, + debhelper (>= 7), + default-jdk, + javahelper, + junit, + libcommons-logging-java, + libdom4j-java, + liblog4j1.2-java, + libxmlbeans-java, + maven-repo-helper Standards-Version: 3.9.4 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libapache-poi-java Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libapache-poi-java/ @@ -11,17 +25,28 @@ Package: libapache-poi-java Architecture: all -Depends: libcommons-logging-java, liblog4j1.2-java, libxalan2-java, libcommons-beanutils-java, libcommons-lang-java, ${misc:Depends} +Depends: libcommons-logging-java, + libdom4j-java, + liblog4j1.2-java, + libxmlbeans-java, + ${misc:Depends} Suggests: libapache-poi-java-doc Conflicts: libjakarta-poi-java Replaces: libjakarta-poi-java Provides: libjakarta-poi-java -Description: Poor Obfuscation Implementation - The POI project consists of APIs for manipulating various file formats - based upon Microsoft's OLE 2 Compound Document format using pure Java. +Description: Apache POI - Java API for Microsoft Documents + Apache POI provides a Java API for manipulating various file formats based upon + the Office Open XML standards (OOXML) and Microsoft's OLE 2 Compound Document + format (OLE2). . - OLE 2 Compound Document Format based files include - most Microsoft Office files such as XLS and DOC. + Apache POI supports the following formats: + * Word (DOC, DOCX) + * Excel (XLS, XLSX) + * PowerPoint (PPT, PPTX) + * Visio (VSD) + * Publisher (PUB) + * Outlook + * TNEF (Transport Neutral Encoding Format) Package: libapache-poi-java-doc Section: doc @@ -31,8 +56,18 @@ Conflicts: libjakarta-poi-java-doc Replaces: libjakarta-poi-java-doc Provides: libjakarta-poi-java-doc -Description: Poor Obfuscation Implementation Documentation - The POI project consists of APIs for manipulating various file formats - based upon Microsoft's OLE 2 Compound Document format using pure Java. +Description: Apache POI - Java API for Microsoft Documents (Documentation) + Apache POI provides a Java API for manipulating various file formats based upon + the Office Open XML standards (OOXML) and Microsoft's OLE 2 Compound Document + format (OLE2). . - This package includes the documentation. + Apache POI supports the following formats: + * Word (DOC, DOCX) + * Excel (XLS, XLSX) + * PowerPoint (PPT, PPTX) + * Visio (VSD) + * Publisher (PUB) + * Outlook + * TNEF (Transport Neutral Encoding Format) + . + This package contains the documentation for libapache-poi-java. Modified: trunk/libapache-poi-java/debian/copyright =================================================================== --- trunk/libapache-poi-java/debian/copyright 2013-07-10 14:32:37 UTC (rev 17007) +++ trunk/libapache-poi-java/debian/copyright 2013-07-11 09:51:48 UTC (rev 17008) @@ -1,28 +1,40 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: Apache POI - the Java API for Microsoft Documents +Upstream-Name: Apache POI Source: http://poi.apache.org Files: * -Copyright: 2003- The Apache Software Foundation - 2003- Glen Stampoultzis <[email protected]> - 2003- Nick Burch <[email protected]> - 2003- Rainer Klute <[email protected]> - 2003- Yegor Kozlov <[email protected]> +Copyright: 2003-2012, The Apache Software Foundation License: Apache-2.0 Files: src/resources/scratchpad/org/apache/poi/hdgf/chunks_parse_cmds.tbl -Copyright: 2006-2007 Valek Filippov ([email protected]) +Copyright: 2006-2007, Valek Filippov ([email protected]) License: Apache-2.0 or GPL-3 +Files: ooxml-xsds/* +Copyright: 2006, Ecma International +License: + The Office Open XML schema definitions used by Apache POI are + a part of the Office Open XML ECMA Specification (ECMA-376, [1]). + As defined in section 9.4 of the ECMA bylaws [2], this specification + is available to all interested parties without restriction: + . + 9.4 All documents when approved shall be made available to + all interested parties without restriction. + . + [1] http://www.ecma-international.org/publications/standards/Ecma-376.htm + [2] http://www.ecma-international.org/memento/Ecmabylaws.htm + + Files: debian/* -Copyright: 2003- Christian Bayle <[email protected]> - 2005- Wolfgang Baer <[email protected]> - 2006- Arnaud Vandyck <[email protected]> - 2007- Michael Koch <[email protected]> - 2007- Rene Engelhard <[email protected]> - 2009- Damien Raude-Morvan <[email protected]> - 2009- Torsten Werner <[email protected]> - 2012- tony mancill <[email protected]> +Copyright: 2003, Christian Bayle <[email protected]> + 2005, Wolfgang Baer <[email protected]> + 2006, Arnaud Vandyck <[email protected]> + 2007, Michael Koch <[email protected]> + 2007, Rene Engelhard <[email protected]> + 2009, Damien Raude-Morvan <[email protected]> + 2009, Torsten Werner <[email protected]> + 2012, tony mancill <[email protected]> + 2013, Emmanuel Bourg <[email protected]> License: Apache-2.0 X-Comment: It is assumed that package maintainers have licensed their work under terms compatible with upstream licensing terms. Modified: trunk/libapache-poi-java/debian/links =================================================================== --- trunk/libapache-poi-java/debian/links 2013-07-10 14:32:37 UTC (rev 17007) +++ trunk/libapache-poi-java/debian/links 2013-07-11 09:51:48 UTC (rev 17008) @@ -1,4 +1,3 @@ # some compatibility symlinks /usr/share/java/poi.jar /usr/share/java/jakarta-poi.jar -/usr/share/java/poi-contrib.jar /usr/share/java/jakarta-contrib-poi.jar /usr/share/java/poi-scratchpad.jar /usr/share/java/jakarta-scratchpad-poi.jar Modified: trunk/libapache-poi-java/debian/orig-tar.exclude =================================================================== --- trunk/libapache-poi-java/debian/orig-tar.exclude 2013-07-10 14:32:37 UTC (rev 17007) +++ trunk/libapache-poi-java/debian/orig-tar.exclude 2013-07-11 09:51:48 UTC (rev 17008) @@ -1,13 +1,2 @@ lib/* -docs/* -test-data/* *.jar -*.ppt -*.pptx -*.doc -*.docx -*.dotx -*.xls -*.xlsx -*.vsd -*.pub Modified: trunk/libapache-poi-java/debian/orig-tar.sh =================================================================== --- trunk/libapache-poi-java/debian/orig-tar.sh 2013-07-10 14:32:37 UTC (rev 17007) +++ trunk/libapache-poi-java/debian/orig-tar.sh 2013-07-11 09:51:48 UTC (rev 17008) @@ -1,12 +1,23 @@ #!/bin/sh -e -# $2 = version -# $3 = file -DIR=libjakarta-poi-java-$2.orig -TAR=libjakarta-poi-java_$2+dfsg.orig.tar.gz -TAG=REL_`echo $2 | sed "s/\./_/"` +VERSION=$2 +DIR=apache-poi-$VERSION +TAR=../libapache-poi-java_$VERSION.orig.tar.gz +TAG=REL_`echo $VERSION | sed "s/\./_/"` + +# Checkout the code from svn svn export http://svn.apache.org/repos/asf/poi/tags/$TAG $DIR + +# Fetch the OOXML schemas from the ECMA site. +# These files are available to all interested parties without +# restriction according to the ECMA bylaws: +# http://www.ecma-international.org/memento/Ecmabylaws.htm#art9.4 +wget 'http://www.ecma-international.org/publications/files/ECMA-ST/Office%20Open%20XML%201st%20edition%20Part%204%20(PDF).zip' +unzip 'Office Open XML 1st edition Part 4 (PDF).zip' OfficeOpenXML-XMLSchema.zip +unzip OfficeOpenXML-XMLSchema.zip -d $DIR/ooxml-xsds +rm *.zip + GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR rm -rf $DIR Deleted: trunk/libapache-poi-java/debian/patches/01_javac_encoding.patch =================================================================== --- trunk/libapache-poi-java/debian/patches/01_javac_encoding.patch 2013-07-10 14:32:37 UTC (rev 17007) +++ trunk/libapache-poi-java/debian/patches/01_javac_encoding.patch 2013-07-11 09:51:48 UTC (rev 17008) @@ -1,96 +0,0 @@ -Description: set encoding of each call to "javac" when compiling source code -Author: Damien Raude-Morvan <[email protected]> -Forwarded: no -Last-Update:2009-10-01 ---- a/build.xml -+++ b/build.xml -@@ -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/libapache-poi-java/debian/patches/02_classpath.patch =================================================================== --- trunk/libapache-poi-java/debian/patches/02_classpath.patch 2013-07-10 14:32:37 UTC (rev 17007) +++ trunk/libapache-poi-java/debian/patches/02_classpath.patch 2013-07-11 09:51:48 UTC (rev 17008) @@ -5,7 +5,7 @@ Last-Update:2009-10-01 --- a/build.xml +++ b/build.xml -@@ -166,9 +166,8 @@ +@@ -155,9 +155,9 @@ </propertyset> <path id="main.classpath"> @@ -14,6 +14,7 @@ - </fileset> + <pathelement location="${main.commons-logging.jar}"/> + <pathelement location="${main.log4j.jar}"/> ++ <pathelement location="${main.junit.jar}"/> </path> <path id="scratchpad.classpath"> Deleted: trunk/libapache-poi-java/debian/patches/03_no_ooxml.patch =================================================================== --- trunk/libapache-poi-java/debian/patches/03_no_ooxml.patch 2013-07-10 14:32:37 UTC (rev 17007) +++ trunk/libapache-poi-java/debian/patches/03_no_ooxml.patch 2013-07-11 09:51:48 UTC (rev 17008) @@ -1,46 +0,0 @@ -Description: disable build of "example" and "ooxml" modules - ooxml depends on non-DFSG-free jars. -Author: Damien Raude-Morvan <[email protected]> -Forwarded: no -Last-Update:2009-12-30 ---- a/build.xml -+++ b/build.xml -@@ -411,10 +411,10 @@ - </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-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/libapache-poi-java/debian/patches/04_jar_names.patch =================================================================== --- trunk/libapache-poi-java/debian/patches/04_jar_names.patch 2013-07-10 14:32:37 UTC (rev 17007) +++ trunk/libapache-poi-java/debian/patches/04_jar_names.patch 2013-07-11 09:51:48 UTC (rev 17008) @@ -4,7 +4,7 @@ Last-Update:2009-10-01 --- a/build.xml +++ b/build.xml -@@ -880,35 +880,35 @@ +@@ -815,27 +815,27 @@ <attribute name="Implementation-Vendor-Id" value="org.apache.poi"/> <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/> </manifest> @@ -14,33 +14,24 @@ <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" - 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" 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"> Added: trunk/libapache-poi-java/debian/patches/05_use-local-ooxml-xsds.patch =================================================================== --- trunk/libapache-poi-java/debian/patches/05_use-local-ooxml-xsds.patch (rev 0) +++ trunk/libapache-poi-java/debian/patches/05_use-local-ooxml-xsds.patch 2013-07-11 09:51:48 UTC (rev 17008) @@ -0,0 +1,22 @@ +Description: Patch to use the local OOXML schema instead of fetching the files from the ECMA site at build time +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/build.xml ++++ b/build.xml +@@ -353,7 +353,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"/> +@@ -370,7 +370,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" Modified: trunk/libapache-poi-java/debian/patches/series =================================================================== --- trunk/libapache-poi-java/debian/patches/series 2013-07-10 14:32:37 UTC (rev 17007) +++ trunk/libapache-poi-java/debian/patches/series 2013-07-11 09:51:48 UTC (rev 17008) @@ -1,4 +1,3 @@ -01_javac_encoding.patch 02_classpath.patch -03_no_ooxml.patch 04_jar_names.patch +05_use-local-ooxml-xsds.patch Modified: trunk/libapache-poi-java/debian/rules =================================================================== --- trunk/libapache-poi-java/debian/rules 2013-07-10 14:32:37 UTC (rev 17007) +++ trunk/libapache-poi-java/debian/rules 2013-07-11 09:51:48 UTC (rev 17008) @@ -13,10 +13,10 @@ 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_JARS := ant ant-junit DEB_ANT_BUILD_TARGET := jar maven-poms javadocs -#DEB_ANT_CHECK_TARGET := test -DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt +DEB_ANT_CHECK_TARGET := test +DEB_INSTALL_CHANGELOGS_ALL := legal/RELEASE_NOTES.txt ANT_ARGS := -Dversion.id=$(VERSION) @@ -24,14 +24,19 @@ mh_clean -test -d docs/skin/css && rmdir docs/skin/css -rm -rf debian/tmp + rm -f ooxml-lib/*.jar binary-post-install/lib$(PACKAGE)-java:: mh_installpom -plib$(PACKAGE)-java $(POM_DIR)/poi-$(VERSION).pom - mh_installpom -plib$(PACKAGE)-java $(POM_DIR)/poi-contrib-$(VERSION).pom mh_installpom -plib$(PACKAGE)-java $(POM_DIR)/poi-scratchpad-$(VERSION).pom + mh_installpom -plib$(PACKAGE)-java $(POM_DIR)/poi-ooxml-$(VERSION).pom + mh_installpom -plib$(PACKAGE)-java $(POM_DIR)/poi-ooxml-schemas-$(VERSION).pom mh_installjar -plib$(PACKAGE)-java -l $(POM_DIR)/poi-$(VERSION).pom $(JAR_DIR)/poi-$(VERSION).jar - mh_installjar -plib$(PACKAGE)-java -l $(POM_DIR)/poi-contrib-$(VERSION).pom $(JAR_DIR)/poi-contrib-$(VERSION).jar mh_installjar -plib$(PACKAGE)-java -l $(POM_DIR)/poi-scratchpad-$(VERSION).pom $(JAR_DIR)/poi-scratchpad-$(VERSION).jar + mh_installjar -plib$(PACKAGE)-java -l $(POM_DIR)/poi-ooxml-$(VERSION).pom $(JAR_DIR)/poi-ooxml-$(VERSION).jar + mh_installjar -plib$(PACKAGE)-java -l $(POM_DIR)/poi-ooxml-schemas-$(VERSION).pom $(JAR_DIR)/poi-ooxml-schemas-$(VERSION).jar + + jh_classpath -plib$(PACKAGE)-java get-orig-source: debian/orig-tar.sh --upstream-version $(VERSION) Modified: trunk/libapache-poi-java/debian/watch =================================================================== --- trunk/libapache-poi-java/debian/watch 2013-07-10 14:32:37 UTC (rev 17007) +++ trunk/libapache-poi-java/debian/watch 2013-07-11 09:51:48 UTC (rev 17008) @@ -1,3 +1,2 @@ version=3 -opts=dversionmangle=s/\+dfsg$// \ - http://www.apache.org/dist/poi/release/src/poi-src-([\d\.]*)-(?:.*).*.tar.gz +http://archive.apache.org/dist/poi/release/src/poi-src-([\d\.]*)-(?:.*).*.tar.gz _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
