[pkg-java] r17009 - in trunk/libapache-poi-java/debian: . patches
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Thu Jul 11 10:55:57 UTC 2013
Author: ebourg-guest
Date: 2013-07-11 10:55:57 +0000 (Thu, 11 Jul 2013)
New Revision: 17009
Added:
trunk/libapache-poi-java/debian/libapache-poi-java.classpath
Removed:
trunk/libapache-poi-java/debian/patches/02_classpath.patch
Modified:
trunk/libapache-poi-java/debian/README.Debian
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
Log:
New upstream release (3.8)
Modified: trunk/libapache-poi-java/debian/README.Debian
===================================================================
--- trunk/libapache-poi-java/debian/README.Debian 2013-07-11 09:51:48 UTC (rev 17008)
+++ trunk/libapache-poi-java/debian/README.Debian 2013-07-11 10:55:57 UTC (rev 17009)
@@ -4,7 +4,7 @@
Apache POI consists of four jars in /usr/share/java. They require additional
jars on the CLASSPATH to be used:
- poi.jar (requires commons-logging.jar and log4j-1.2.jar)
+ poi.jar (requires commons-codec.jar, 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/ant.properties
===================================================================
--- trunk/libapache-poi-java/debian/ant.properties 2013-07-11 09:51:48 UTC (rev 17008)
+++ trunk/libapache-poi-java/debian/ant.properties 2013-07-11 10:55:57 UTC (rev 17009)
@@ -1,6 +1,8 @@
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/junit.jar
Modified: trunk/libapache-poi-java/debian/changelog
===================================================================
--- trunk/libapache-poi-java/debian/changelog 2013-07-11 09:51:48 UTC (rev 17008)
+++ trunk/libapache-poi-java/debian/changelog 2013-07-11 10:55:57 UTC (rev 17009)
@@ -1,4 +1,4 @@
-libapache-poi-java (3.7-1) UNRELEASED; urgency=low
+libapache-poi-java (3.8-1) UNRELEASED; urgency=low
[ Emmanuel Bourg ]
* New upstream release
@@ -6,7 +6,9 @@
- 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
+ - 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)
Modified: trunk/libapache-poi-java/debian/control
===================================================================
--- trunk/libapache-poi-java/debian/control 2013-07-11 09:51:48 UTC (rev 17008)
+++ trunk/libapache-poi-java/debian/control 2013-07-11 10:55:57 UTC (rev 17009)
@@ -13,6 +13,7 @@
default-jdk,
javahelper,
junit,
+ libcommons-codec-java,
libcommons-logging-java,
libdom4j-java,
liblog4j1.2-java,
@@ -25,7 +26,9 @@
Package: libapache-poi-java
Architecture: all
-Depends: libcommons-logging-java,
+Depends: ant,
+ libcommons-codec-java,
+ libcommons-logging-java,
libdom4j-java,
liblog4j1.2-java,
libxmlbeans-java,
Added: trunk/libapache-poi-java/debian/libapache-poi-java.classpath
===================================================================
--- trunk/libapache-poi-java/debian/libapache-poi-java.classpath (rev 0)
+++ trunk/libapache-poi-java/debian/libapache-poi-java.classpath 2013-07-11 10:55:57 UTC (rev 17009)
@@ -0,0 +1,5 @@
+/usr/share/java/poi.jar commons-logging.jar log4-1.2.jar
+/usr/share/java/poi-ooxml.jar poi.jar poi-ooxml-schemas.jar dom4j.jar
+/usr/share/java/poi-ooxml-schemas.jar xmlbeans.jar
+/usr/share/java/poi-scratchpad.jar poi.jar
+/usr/share/java/poi-excelant.jar poi.jar poi-ooxml.jar ant.jar
Modified: trunk/libapache-poi-java/debian/orig-tar.sh
===================================================================
--- trunk/libapache-poi-java/debian/orig-tar.sh 2013-07-11 09:51:48 UTC (rev 17008)
+++ trunk/libapache-poi-java/debian/orig-tar.sh 2013-07-11 10:55:57 UTC (rev 17009)
@@ -4,7 +4,7 @@
DIR=apache-poi-$VERSION
TAR=../libapache-poi-java_$VERSION.orig.tar.gz
-TAG=REL_`echo $VERSION | sed "s/\./_/"`
+TAG=REL_`echo $VERSION | sed "s/\./_/"`_FINAL
# Checkout the code from svn
svn export http://svn.apache.org/repos/asf/poi/tags/$TAG $DIR
Deleted: trunk/libapache-poi-java/debian/patches/02_classpath.patch
===================================================================
--- trunk/libapache-poi-java/debian/patches/02_classpath.patch 2013-07-11 09:51:48 UTC (rev 17008)
+++ trunk/libapache-poi-java/debian/patches/02_classpath.patch 2013-07-11 10:55:57 UTC (rev 17009)
@@ -1,20 +0,0 @@
-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
-@@ -155,9 +155,9 @@
- </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.junit.jar}"/>
- </path>
-
- <path id="scratchpad.classpath">
Modified: trunk/libapache-poi-java/debian/patches/04_jar_names.patch
===================================================================
--- trunk/libapache-poi-java/debian/patches/04_jar_names.patch 2013-07-11 09:51:48 UTC (rev 17008)
+++ trunk/libapache-poi-java/debian/patches/04_jar_names.patch 2013-07-11 10:55:57 UTC (rev 17009)
@@ -1,10 +1,10 @@
Description: remove ${DSTAMP} suffix added to JARs
Author: Damien Raude-Morvan <drazzib at debian.org>
Forwarded: no
-Last-Update:2009-10-01
+Last-Update:2013-07-10
--- a/build.xml
+++ b/build.xml
-@@ -815,27 +815,27 @@
+@@ -952,32 +952,32 @@
<attribute name="Implementation-Vendor-Id" value="org.apache.poi"/>
<attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
</manifest>
@@ -37,3 +37,9 @@
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/"/>
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 2013-07-11 09:51:48 UTC (rev 17008)
+++ trunk/libapache-poi-java/debian/patches/05_use-local-ooxml-xsds.patch 2013-07-11 10:55:57 UTC (rev 17009)
@@ -3,7 +3,7 @@
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -353,7 +353,7 @@
+@@ -401,7 +401,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"/>
-@@ -370,7 +370,6 @@
+@@ -418,7 +418,6 @@
<equals arg1="${sun.arch.data.model}" arg2="64" />
</condition>
Modified: trunk/libapache-poi-java/debian/patches/series
===================================================================
--- trunk/libapache-poi-java/debian/patches/series 2013-07-11 09:51:48 UTC (rev 17008)
+++ trunk/libapache-poi-java/debian/patches/series 2013-07-11 10:55:57 UTC (rev 17009)
@@ -1,3 +1,2 @@
-02_classpath.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-11 09:51:48 UTC (rev 17008)
+++ trunk/libapache-poi-java/debian/rules 2013-07-11 10:55:57 UTC (rev 17009)
@@ -16,7 +16,7 @@
DEB_JARS := ant ant-junit
DEB_ANT_BUILD_TARGET := jar maven-poms javadocs
DEB_ANT_CHECK_TARGET := test
-DEB_INSTALL_CHANGELOGS_ALL := legal/RELEASE_NOTES.txt
+DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt
ANT_ARGS := -Dversion.id=$(VERSION)
@@ -31,10 +31,12 @@
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_installpom -plib$(PACKAGE)-java $(POM_DIR)/poi-excelant-$(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-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
+ mh_installjar -plib$(PACKAGE)-java -l $(POM_DIR)/poi-excelant-$(VERSION).pom $(JAR_DIR)/poi-ooxml-schemas-$(VERSION).jar
jh_classpath -plib$(PACKAGE)-java
More information about the pkg-java-commits
mailing list