Bug#306800: jta: Please allow building with sun-j2sdk1.5 and recognize the JAVA_HOME directories used by java-package

[Andreas Jochens]

Package: jta
Version: 2.5-1
Severity: wishlist
Tags: patch

Please change the Build-Depends from 'j2sdk1.4' to 'java2-compiler' to allow
building with sun-2jsdk1.5.

Please also set JAVA_HOME correctly to the directories used by the
{sun,ibm,blackdown}-j2sdk1.x packages which are created by java-package.

Regards
Andreas Jochens

diff -urN ../tmp-orig/jta-2.5/debian/control ./debian/control
--- ../tmp-orig/jta-2.5/debian/control	2005-04-28 17:49:51.881513182 +0200
+++ ./debian/control	2005-04-28 17:47:44.499878134 +0200
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Jaldhar H. Vyas <jaldhar@debian.org>, Arnaud Vandyck <avdyk@debian.org>
-Build-Depends-Indep: debhelper (>= 4.1), j2sdk1.4, libgnu-regexp-java, libcrimson-java, libjdom0-java
+Build-Depends-Indep: debhelper (>= 4.1), java2-compiler, libgnu-regexp-java, libcrimson-java, libjdom0-java
 Standards-Version: 3.6.1
 
 Package: jta
diff -urN ../tmp-orig/jta-2.5/debian/rules ./debian/rules
--- ../tmp-orig/jta-2.5/debian/rules	2005-04-28 17:49:51.881513182 +0200
+++ ./debian/rules	2005-04-28 17:39:02.000000000 +0200
@@ -6,18 +6,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), amd64))
-	export JAVA_HOME=/usr/lib/j2sdk1.4-blackdown
-else
-	export JITC_PROCESSOR_TYPE=6
-	export JAVA_HOME=/usr/local/IBMJava2-ppc-142
-endif
-
-JAVA	=	$(JAVA_HOME)/bin/java
-JAR	=	$(JAVA_HOME)/bin/jar
-JAVAC	=	$(JAVA_HOME)/bin/javac
-JAVADOC =	$(JAVA_HOME)/bin/javadoc
-JAVAH 	=	$(JAVA_HOME)/bin/javah
+JAVA_HOME_DIRS=/usr/lib/j2sdk1.5-sun /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 CLASSPATH=/usr/share/java/regexp.jar:/usr/share/java/crimson.jar:/usr/share/java/jdom0.jar
 
 configure: configure-stamp