Author: avdyk
Date: 2006-10-30 14:20:03 +0100 (Mon, 30 Oct 2006)
New Revision: 2685
Removed:
trunk/libjakarta-poi-java/debian/patches/01_BTreeSet_static_a.patch
trunk/libjakarta-poi-java/debian/patches/01_BTreeSet_static_b.patch
trunk/libjakarta-poi-java/debian/patches/01_ExcludeTestsNeedingDisplay.patch
Modified:
trunk/libjakarta-poi-java/debian/changelog
trunk/libjakarta-poi-java/debian/control
trunk/libjakarta-poi-java/debian/rules
Log:
libjakarta-poi-java (2.5.1-3) unstable; urgency=low
* Standards-Version: updated to 3.7.2, no change needed
* built with java-gcj-compat-dev
* no more run the tests (closes: #393151). I was able to run a lot of
tests with java-gcj-compat, but got a problem 'cannot open
display'. Maybe it'll be a problem with pbuilders.
* removed the patches
-- Arnaud Vandyck <[EMAIL PROTECTED]> Mon, 30 Oct 2006 14:19:36 +0100
Modified: trunk/libjakarta-poi-java/debian/changelog
===================================================================
--- trunk/libjakarta-poi-java/debian/changelog 2006-10-30 09:51:22 UTC (rev
2684)
+++ trunk/libjakarta-poi-java/debian/changelog 2006-10-30 13:20:03 UTC (rev
2685)
@@ -1,3 +1,14 @@
+libjakarta-poi-java (2.5.1-3) unstable; urgency=low
+
+ * Standards-Version: updated to 3.7.2, no change needed
+ * built with java-gcj-compat-dev
+ * no more run the tests (closes: #393151). I was able to run a lot of
+ tests with java-gcj-compat, but got a problem 'cannot open
+ display'. Maybe it'll be a problem with pbuilders.
+ * removed the patches
+
+ -- Arnaud Vandyck <[EMAIL PROTECTED]> Mon, 30 Oct 2006 14:19:36 +0100
+
libjakarta-poi-java (2.5.1-2) unstable; urgency=low
* Upload to unstable
Modified: trunk/libjakarta-poi-java/debian/control
===================================================================
--- trunk/libjakarta-poi-java/debian/control 2006-10-30 09:51:22 UTC (rev
2684)
+++ trunk/libjakarta-poi-java/debian/control 2006-10-30 13:20:03 UTC (rev
2685)
@@ -2,14 +2,14 @@
Section: libs
Priority: optional
Maintainer: Debian Java Maintainers
<[email protected]>
-Uploaders: Christian Bayle <[EMAIL PROTECTED]>, Wolfgang Baer <[EMAIL
PROTECTED]>
-Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, ant, ant-optional, junit,
kaffe, libcommons-logging-java, liblog4j1.2-java, libxalan2-java,
libcommons-beanutils-java, libcommons-lang-java
-Standards-Version: 3.6.2
+Uploaders: Christian Bayle <[EMAIL PROTECTED]>, Wolfgang Baer <[EMAIL
PROTECTED]>, Arnaud Vandyck <[EMAIL PROTECTED]>
+Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, ant, ant-optional, junit,
java-gcj-compat-dev, libcommons-logging-java, liblog4j1.2-java, libxalan2-java,
libcommons-beanutils-java, libcommons-lang-java
+Standards-Version: 3.7.2
Package: libjakarta-poi-java
Section: libs
Architecture: all
-Depends: kaffe | java1-runtime | java2-runtime, libcommons-logging-java,
liblog4j1.2-java, libxalan2-java, libcommons-beanutils-java,
libcommons-lang-java
+Depends: java-gcj-compat | java1-runtime | java2-runtime,
libcommons-logging-java, liblog4j1.2-java, libxalan2-java,
libcommons-beanutils-java, libcommons-lang-java
Suggests: java-virtual-machine, libjakarta-poi-java-doc
Description: Poor Obfuscation Implementation
The POI project consists of APIs for manipulating various file formats
Deleted: trunk/libjakarta-poi-java/debian/patches/01_BTreeSet_static_a.patch
===================================================================
--- trunk/libjakarta-poi-java/debian/patches/01_BTreeSet_static_a.patch
2006-10-30 09:51:22 UTC (rev 2684)
+++ trunk/libjakarta-poi-java/debian/patches/01_BTreeSet_static_a.patch
2006-10-30 13:20:03 UTC (rev 2685)
@@ -1,11 +0,0 @@
---- src/scratchpad/src/org/apache/poi/hdf/extractor/util/BTreeSet.java.orig
2004-02-22 12:19:33.000000000 +0100
-+++ src/scratchpad/src/org/apache/poi/hdf/extractor/util/BTreeSet.java
2005-10-29 20:13:43.000000000 +0200
-@@ -212,7 +212,7 @@
- public static class Entry {
-
- public Object element;
-- public BTreeNode child;
-+ public org.apache.poi.hdf.extractor.util.BTreeSet.BTreeNode child;
- }
-
-
Deleted: trunk/libjakarta-poi-java/debian/patches/01_BTreeSet_static_b.patch
===================================================================
--- trunk/libjakarta-poi-java/debian/patches/01_BTreeSet_static_b.patch
2006-10-30 09:51:22 UTC (rev 2684)
+++ trunk/libjakarta-poi-java/debian/patches/01_BTreeSet_static_b.patch
2006-10-30 13:20:03 UTC (rev 2685)
@@ -1,11 +0,0 @@
---- src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java.orig
2004-02-22 12:19:35.000000000 +0100
-+++ src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java
2005-10-29 20:13:47.000000000 +0200
-@@ -294,7 +294,7 @@
- {
-
- public Object element;
-- public BTreeNode child;
-+ public org.apache.poi.hdf.model.util.BTreeSet.BTreeNode child;
- }
-
-
Deleted:
trunk/libjakarta-poi-java/debian/patches/01_ExcludeTestsNeedingDisplay.patch
===================================================================
---
trunk/libjakarta-poi-java/debian/patches/01_ExcludeTestsNeedingDisplay.patch
2006-10-30 09:51:22 UTC (rev 2684)
+++
trunk/libjakarta-poi-java/debian/patches/01_ExcludeTestsNeedingDisplay.patch
2006-10-30 13:20:03 UTC (rev 2685)
@@ -1,13 +0,0 @@
---- build.xml.orig 2005-10-30 12:10:40.000000000 +0100
-+++ build.xml 2005-10-30 12:13:06.000000000 +0100
-@@ -252,7 +252,9 @@
- <batchtest todir="${main.reports.test}">
- <fileset dir="${main.src.test}">
- <include name="**/Test*.java"/>
-- <exclude name="**/AllTests.java"/>
-+ <exclude name="**/AllTests.java"/>
-+ <exclude name="**/TestEscherGraphics.java"/>
-+ <exclude name="**/TestEscherGraphics2d.java"/>
- </fileset>
- </batchtest>
- </junit>
Modified: trunk/libjakarta-poi-java/debian/rules
===================================================================
--- trunk/libjakarta-poi-java/debian/rules 2006-10-30 09:51:22 UTC (rev
2684)
+++ trunk/libjakarta-poi-java/debian/rules 2006-10-30 13:20:03 UTC (rev
2685)
@@ -10,11 +10,11 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-JAVA_HOME := /usr/lib/kaffe
+JAVA_HOME := /usr/lib/jvm/java-gcj
ANT_HOME := /usr/share/ant
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-junit.jar
junit xalan2
-DEB_ANT_BUILD_TARGET := compile jar test
+DEB_JARS := $(ANT_HOME)/lib/ant-junit.jar junit xalan2
+DEB_ANT_BUILD_TARGET := compile jar #test
install/libjakarta-poi-java::
install -m 644 build/dist/poi-$(VERSION)*.jar
debian/libjakarta-poi-java/usr/share/java/jakarta-poi-$(VERSION).jar
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
