[libitext-java] 03/76: RELEASE_1_02b-4

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libitext-java.

commit 4f1702f835b26239fe315b5efe9014b8ce9e64a1
Author: Christian Bayle <bayle at debian.org>
Date:   Mon Apr 25 20:04:16 2005 +0000

    RELEASE_1_02b-4
---
 debian/changelog |  7 +++++++
 debian/rules     | 19 ++++++++-----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 00eccf9..ccf66e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 at debian.org>  Mon, 25 Apr 2005 21:56:25 +0200
+
 libitext-java (1.02b-3) unstable; urgency=low
 
   * Rebuild with .orig tarball
diff --git a/debian/rules b/debian/rules
index 93be79c..99e6ed6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libitext-java.git