CVS libitext-java/debian

[Christian Bayle]

Update of /cvsroot/pkg-java/libitext-java/debian
In directory haydn:/tmp/cvs-serv32746/libitext-java/debian

Modified Files:
	changelog rules 
Log Message:
RELEASE_1_02b-4


--- /cvsroot/pkg-java/libitext-java/debian/changelog	2004/02/19 20:29:01	1.2
+++ /cvsroot/pkg-java/libitext-java/debian/changelog	2005/04/25 20:04:16	1.3
@@ -1,3 +1,10 @@
+libitext-java (1.02b-4) unstable; urgency=high
+
+  * Applied patch proposed by Andreas Jochens related to
+  FTBFS: JAVA_HOME is not defined correctly. (Closes: Bug#306296)
+
+ -- Christian Bayle <bayle@debian.org>  Mon, 25 Apr 2005 21:56:25 +0200
+
 libitext-java (1.02b-3) unstable; urgency=low
 
   * Rebuild with .orig tarball
--- /cvsroot/pkg-java/libitext-java/debian/rules	2004/02/19 20:29:01	1.2
+++ /cvsroot/pkg-java/libitext-java/debian/rules	2005/04/25 20:04:16	1.3
@@ -7,19 +7,16 @@
 # Choose the VM
 # Kaffe
 #export JAVA_HOME=/usr/lib/kaffe
-#export JAVA=/usr/lib/kaffe/bin/java
-#export JAVAC=/usr/bin/jikes-kaffe
-#export CLASSPATH=/usr/share/kaffe
 # Sablevm
 #export JAVA_HOME=/usr/lib/sablevm
-#export JAVA=/usr/bin/sablevm
-#export JAVAC=/usr/bin/jikes-sablevm
-#export CLASSPATH=/usr/share/sablevm/classes
-# Blackdown
-export JAVA_HOME=/usr/lib/j2sdk1.4
-export JAVA=/usr/lib/j2sdk1.4/bin/java
-export JAVAC=/usr/lib/j2sdk1.4/bin/javac
-export CLASSPATH=/usr/lib/j2sdk1.4/jre/lib/rt.jar
+# Sun/IBM/Blackdown
+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 JAVA=$(JAVA_HOME)/bin/java
+export JAVAC=$(JAVA_HOME)/bin/javac
+export CLASSPATH=$(JAVA_HOME)/jre/lib/rt.jar
+
 # GCJ
 #export CLASSPATH=/usr/share/java/libgcj.jar
 #export JAVAC=/usr/bin/jikes-gij