[pkg-java] r9260 - trunk/jetty/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-07-13 23:36:31 +0000 (Mon, 13 Jul 2009)
New Revision: 9260

Modified:
   trunk/jetty/debian/changelog
   trunk/jetty/debian/control
   trunk/jetty/debian/rules
Log:
* Add a Build-Depends dependency on maven-repo-helper
* Use openjdk-6-jdk for the build; add a Build-Depends on this
  package. Required to build the javadoc.

Modified: trunk/jetty/debian/changelog
===================================================================
--- trunk/jetty/debian/changelog	2009-07-13 23:33:18 UTC (rev 9259)
+++ trunk/jetty/debian/changelog	2009-07-13 23:36:31 UTC (rev 9260)
@@ -6,13 +6,15 @@
     the build to use the new start-daemon component
   * Remove the Build-Depend on quilt as the patch is not needed anymore.
   * Add the Maven POM to the package
-  * Add a Build-Depends-Indep dependency on maven-repo-helper
+  * Add a Build-Depends dependency on maven-repo-helper
   * Use mh_installpom and mh_installjar to install the POM and the jar to the
     Maven repository
   * Add optional support for web applications located in /usr/share/webapps.
   * Add a cron job that cleans up the old log files in /var/log/jetty.
   * Register the Javadoc into Debian documentation and put it in a 
     separate package (libjetty-java-doc)
+  * Use openjdk-6-jdk for the build; add a Build-Depends on this
+    package. Required to build the javadoc.
   * Update debian/copyright (patch provided by Jan Pascal Vanbest 
     <janpascal at vanbest.org>)
 

Modified: trunk/jetty/debian/control
===================================================================
--- trunk/jetty/debian/control	2009-07-13 23:33:18 UTC (rev 9259)
+++ trunk/jetty/debian/control	2009-07-13 23:36:31 UTC (rev 9260)
@@ -4,8 +4,9 @@
 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), default-jdk, ant, maven-repo-helper, 
- libservlet2.5-java, libslf4j-java, libmx4j-java, libgnumail-java, libgnujaf-java, libcommons-daemon-java
+Build-Depends: debhelper (>= 6), cdbs (>> 0.4.5.3), openjdk-6-jdk, ant, maven-repo-helper
+Build-Depends-Indep: libservlet2.5-java, libslf4j-java, libmx4j-java, libgnumail-java,
+ libgnujaf-java, libcommons-daemon-java
 Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jetty
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jetty

Modified: trunk/jetty/debian/rules
===================================================================
--- trunk/jetty/debian/rules	2009-07-13 23:33:18 UTC (rev 9259)
+++ trunk/jetty/debian/rules	2009-07-13 23:36:31 UTC (rev 9260)
@@ -5,7 +5,7 @@
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME            := /usr/lib/jvm/default-java
+JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
 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