[axis] 10/60: * axis: Depend on default-jre-headless. * Build using java-gcj (axis is not 1.6 source compatible).

[Emmanuel Bourg]

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

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

commit d79a5f16da40db6f93bb64b2d78abde6ec184c01
Author: Matthias Klose <doko at debian.org>
Date:   Thu Jul 31 10:45:17 2008 +0000

      * axis: Depend on default-jre-headless.
      * Build using java-gcj (axis is not 1.6 source compatible).
---
 debian/changelog | 7 +++++++
 debian/control   | 2 +-
 debian/rules     | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 508e455..4425ebd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+axis (1.4-6) UNRELEASED; urgency=low
+
+  * axis: Depend on default-jre-headless.
+  * Build using java-gcj (axis is not 1.6 source compatible).
+
+ -- Matthias Klose <doko at debian.org>  Thu, 31 Jul 2008 10:16:02 +0000
+
 axis (1.4-5) unstable; urgency=low
 
   * Added missing packages to Depends of libaxis-java.
diff --git a/debian/control b/debian/control
index d9dcd68..54024d7 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Architecture: all
 Section: libs
 Recommends: ant, libaxis-java-gcj
 Suggests: libaxis-java-doc
-Depends: java-gcj-compat | java1-runtime | java2-runtime, libwsdl4j-java, libcommons-logging-java, libcommons-discovery-java, libgnujaf-java, libgnumail-java, libservlet2.4-java
+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless, libwsdl4j-java, libcommons-logging-java, libcommons-discovery-java, libgnujaf-java, libgnumail-java, libservlet2.4-java
 Description: A SOAP implementation in Java
  Apache AXIS is an implementation of the SOAP ("Simple Object Access Protocol")
  submission to W3C.
diff --git a/debian/rules b/debian/rules
index 2e7a358..75cbc81 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
   with_gcj_native := yes
 endif
 
+JAVA_HOME := /usr/lib/jvm/default-java
 JAVA_HOME := /usr/lib/jvm/java-gcj
 ANT_HOME := /usr/share/ant
 

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