[libsaxon-java] 03/33: resolved ftbfs and added java_home_dirs support

[Emmanuel Bourg]

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

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

commit d1de6cc18b8cd326ae8b99825a1d873c33bfee15
Author: Arnaud Vandyck <avdyk at debian.org>
Date:   Mon May 2 12:13:11 2005 +0000

    resolved ftbfs and added java_home_dirs support
---
 debian/changelog | 9 +++++++++
 debian/control   | 5 +----
 debian/rules     | 3 ++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1529d6e..16cb2be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 at 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
diff --git a/debian/control b/debian/control
index 9827401..0c85905 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,11 @@ Section: contrib/libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at 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
diff --git a/debian/rules b/debian/rules
index bf015c8..3bbb0f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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

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