[pkg-java] r8486 - trunk/jetty6/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-06-13 11:15:02 +0000 (Sat, 13 Jun 2009)
New Revision: 8486

Modified:
   trunk/jetty6/debian/control
   trunk/jetty6/debian/rules
Log:
* Use default-jdk for the build

Modified: trunk/jetty6/debian/control
===================================================================
--- trunk/jetty6/debian/control	2009-06-13 11:09:45 UTC (rev 8485)
+++ trunk/jetty6/debian/control	2009-06-13 11:15:02 UTC (rev 8486)
@@ -4,8 +4,8 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Philipp Meier <meier at fnogol.de>, Michael Koch <konqueror at gmx.de>, Thierry Carrez <thierry.carrez at ubuntu.com>,
  Ludovic Claude <ludovic.claude at laposte.net>
-Build-Depends: debhelper (>= 6), cdbs (>> 0.4.5.3)
-Build-Depends-Indep: java-gcj-compat-dev, ant, libservlet2.5-java, libmx4j-java, libgnumail-java, libgnujaf-java,
+Build-Depends: debhelper (>= 6), cdbs (>> 0.4.5.3), default-jdk
+Build-Depends-Indep: ant, libservlet2.5-java, libmx4j-java, libgnumail-java, libgnujaf-java,
  libslf4j-java
 Standards-Version: 3.8.1
 

Modified: trunk/jetty6/debian/rules
===================================================================
--- trunk/jetty6/debian/rules	2009-06-13 11:09:45 UTC (rev 8485)
+++ trunk/jetty6/debian/rules	2009-06-13 11:15:02 UTC (rev 8486)
@@ -6,7 +6,7 @@
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME            := /usr/lib/jvm/java-gcj
+JAVA_HOME            := /usr/lib/jvm/default-java
 ANT_HOME             := /usr/share/ant
 DEB_JARS             := servlet-api-2.5 slf4j-api mx4j mx4j-tools gnumail activation
 DEB_ANT_BUILD_TARGET := package