CVS libsaxon-java/debian

[Arnaud Vandyck]

Update of /cvsroot/pkg-java/libsaxon-java/debian
In directory haydn:/tmp/cvs-serv23636/debian

Modified Files:
	changelog control rules 
Log Message:
resolved ftbfs and added java_home_dirs support

--- /cvsroot/pkg-java/libsaxon-java/debian/changelog	2005/04/04 20:24:23	1.2
+++ /cvsroot/pkg-java/libsaxon-java/debian/changelog	2005/05/02 12:13:11	1.3
@@ -1,3 +1,12 @@
+libsaxon-java (1:6.5.3-3) unstable; urgency=low
+
+  * Added dependency on gjdoc and added support to non-free jdk dirs,
+    thanks to Andreas Jochen (closes: #306775).
+  * Removed conflicts, provides, replaces lib-saxon-java which will be
+    remove from the archive.
+
+ -- Arnaud Vandyck <avdyk@debian.org>  Mon,  2 May 2005 12:09:33 +0200
+
 libsaxon-java (1:6.5.3-2) unstable; urgency=medium
 
   * Adjusted libfop-java dependency to fop to fix
--- /cvsroot/pkg-java/libsaxon-java/debian/control	2005/04/04 20:24:23	1.2
+++ /cvsroot/pkg-java/libsaxon-java/debian/control	2005/05/02 12:13:11	1.3
@@ -3,14 +3,11 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk@debian.org>, Wolfgang Baer <WBaer@gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), j2sdk1.4, fastjar, libgnujaxp-java, fop, libjdom-java
+Build-Depends-Indep: debhelper (>= 4.2.30), j2sdk1.4, fastjar, gjdoc, libgnujaxp-java, fop, libjdom-java
 Standards-Version: 3.6.1
 
 Package: libsaxon-java
 Architecture: all
-Provides: lib-saxon-java
-Replaces: lib-saxon-java
-Conflicts: lib-saxon-java
 Depends: kaffe | gij | sablevm | java1-runtime | java2-runtime, libgnujaxp-java
 Suggests: fop, libjdom-java
 Description: The Saxon XSLT Processor
--- /cvsroot/pkg-java/libsaxon-java/debian/rules	2005/04/04 20:24:23	1.2
+++ /cvsroot/pkg-java/libsaxon-java/debian/rules	2005/05/02 12:13:11	1.3
@@ -7,7 +7,8 @@
 
 export JITC_PROCESSOR_TYPE=6
 PACKAGE=libsaxon-java
-JAVA_HOME=/usr/lib/j2se/1.4
+JAVA_HOME_DIRS=/usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.4-blackdown /usr/local/IBMJava2-ppc-142
+JAVA_HOME ?= $(shell for j in $(JAVA_HOME_DIRS); do [ -d "$$j" ] && echo $$j && exit 0; done)
 BASE=debian/$(PACKAGE)
 JAVASHARE=usr/share/java
 SOURCES=src