[pkg-java] r6819 - trunk/axis/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-31 10:45:17 +0000 (Thu, 31 Jul 2008)
New Revision: 6819

Modified:
   trunk/axis/debian/changelog
   trunk/axis/debian/control
   trunk/axis/debian/rules
Log:
  * axis: Depend on default-jre-headless.
  * Build using java-gcj (axis is not 1.6 source compatible).


Modified: trunk/axis/debian/changelog
===================================================================
--- trunk/axis/debian/changelog	2008-07-31 10:15:32 UTC (rev 6818)
+++ trunk/axis/debian/changelog	2008-07-31 10:45:17 UTC (rev 6819)
@@ -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.

Modified: trunk/axis/debian/control
===================================================================
--- trunk/axis/debian/control	2008-07-31 10:15:32 UTC (rev 6818)
+++ trunk/axis/debian/control	2008-07-31 10:45:17 UTC (rev 6819)
@@ -14,7 +14,7 @@
 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.

Modified: trunk/axis/debian/rules
===================================================================
--- trunk/axis/debian/rules	2008-07-31 10:15:32 UTC (rev 6818)
+++ trunk/axis/debian/rules	2008-07-31 10:45:17 UTC (rev 6819)
@@ -11,6 +11,7 @@
   with_gcj_native := yes
 endif
 
+JAVA_HOME := /usr/lib/jvm/default-java
 JAVA_HOME := /usr/lib/jvm/java-gcj
 ANT_HOME := /usr/share/ant