CVS libjakarta-poi-java/debian

[Christian Bayle]

Update of /cvsroot/pkg-java/libjakarta-poi-java/debian
In directory haydn:/tmp/cvs-serv23431/libjakarta-poi-java/debian

Modified Files:
	changelog control rules 
Log Message:
RELEASE_1_10_0-3


--- /cvsroot/pkg-java/libjakarta-poi-java/debian/changelog	2004/06/24 21:13:49	1.3
+++ /cvsroot/pkg-java/libjakarta-poi-java/debian/changelog	2005/04/28 20:59:42	1.4
@@ -1,3 +1,9 @@
+libjakarta-poi-java (1.10.0-4) unstable; urgency=high
+
+  * Fixed FTBFS: Missing Build-Depends on 'ant' (Closes: #306750)
+
+ -- Christian Bayle <bayle@debian.org>  Thu, 28 Apr 2005 21:59:48 +0200
+
 libjakarta-poi-java (1.10.0-3) unstable; urgency=low
 
   * Missing comma in Build-Depends-Indep line of control file
--- /cvsroot/pkg-java/libjakarta-poi-java/debian/control	2004/06/24 21:13:49	1.3
+++ /cvsroot/pkg-java/libjakarta-poi-java/debian/control	2005/04/28 20:59:42	1.4
@@ -2,7 +2,7 @@
 Section: contrib/libs
 Priority: optional
 Maintainer: Christian Bayle <bayle@debian.org>
-Build-Depends-Indep: debhelper (>> 4.0.0), jikes-sablevm , sablevm, fastjar, j2sdk1.4, gjdoc
+Build-Depends-Indep: debhelper, ant, jikes-sablevm , sablevm, fastjar, j2sdk1.4, gjdoc
 Standards-Version: 3.5.8
 
 Package: libjakarta-poi-java
--- /cvsroot/pkg-java/libjakarta-poi-java/debian/rules	2004/06/24 21:13:49	1.2
+++ /cvsroot/pkg-java/libjakarta-poi-java/debian/rules	2005/04/28 20:59:42	1.3
@@ -5,9 +5,9 @@
 
 # Build 
 # Choose the VM
-export JAVA_HOME=/usr/lib/j2sdk1.4/
+JAVA_HOME_DIRS=/usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.4-blackdown
+export JAVA_HOME ?= $(shell for j in $(JAVA_HOME_DIRS); do [ -d "$$j" ] && echo $$j && exit 0; done)
 export JAVADOC=javadoc
-export CLASSPATH=/usr/lib/j2sdk1.4/jre/lib/rt.jar:/usr/share/java/xerces.jar
 export LIBRARY = $(shell head -1 debian/control | sed 's/Source. lib\(.*\)-java/\1/')
 export VERSION = $(shell head -1 debian/changelog | sed 's/.*(\(.*\)-.*).*/\1/' )
 export SRCDIR=$(LIBRARY)-$(VERSION)