Bug#578618: jetty: please build on all architectures (please use default-jdk)

[Petr Salinger]

Package: jetty
Version: 6.1.22-1
User: debian-bsd at lists.debian.org
Usertags: kfreebsd


Hi,

please build libjetty-extra on all architectures.

The proper solution seems be to use default-jdk,
which depends on appropriate arch specific java package,
currently openjdk and gcj.

Patch have been build tested on kfreebsd-amd64.

Petr

diff -u jetty-6.1.22/debian/rules jetty-6.1.22/debian/rules
--- jetty-6.1.22/debian/rules
+++ jetty-6.1.22/debian/rules
@@ -6,7 +6,7 @@

  PACKAGE              := $(DEB_SOURCE_PACKAGE)
  VERSION              := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
+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 commons-daemon
  DEB_ANT_BUILD_TARGET := package
diff -u jetty-6.1.22/debian/control jetty-6.1.22/debian/control
--- jetty-6.1.22/debian/control
+++ jetty-6.1.22/debian/control
@@ -5,7 +5,7 @@
  Uploaders: Michael Koch <konqueror at gmx.de>, Thierry Carrez <thierry.carrez at ubuntu.com>,
   Ludovic Claude <ludovic.claude at laposte.net>, Torsten Werner <twerner at debian.org>,
   Niels Thykier <niels at thykier.net>, Pablo Duboue <pablo.duboue at gmail.com>
-Build-Depends: debhelper (>= 6), cdbs (>> 0.4.5.3), openjdk-6-jdk, ant, maven-repo-helper,
+Build-Depends: debhelper (>= 6), cdbs (>> 0.4.5.3), default-jdk, ant, maven-repo-helper,
   libservlet2.5-java, libslf4j-java, libmx4j-java, libgnumail-java,
   libgnujaf-java, libcommons-daemon-java, quilt
  Standards-Version: 3.8.3