[pkg-java] r12537 - trunk/dom4j/debian

[Thierry Carrez]

Author: ttx-guest
Date: 2010-06-03 14:43:01 +0000 (Thu, 03 Jun 2010)
New Revision: 12537

Modified:
   trunk/dom4j/debian/changelog
   trunk/dom4j/debian/control
   trunk/dom4j/debian/rules
Log:
debian/control, debian/rules: Build with default-jdk

Modified: trunk/dom4j/debian/changelog
===================================================================
--- trunk/dom4j/debian/changelog	2010-06-02 21:43:07 UTC (rev 12536)
+++ trunk/dom4j/debian/changelog	2010-06-03 14:43:01 UTC (rev 12537)
@@ -1,3 +1,9 @@
+dom4j (1.6.1+dfsg.2-4) UNRELEASED; urgency=low
+
+  * debian/control, debian/rules: Build with default-jdk
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com>  Thu, 03 Jun 2010 16:14:12 +0200
+
 dom4j (1.6.1+dfsg.2-3) unstable; urgency=low
 
   * Team upload.

Modified: trunk/dom4j/debian/control
===================================================================
--- trunk/dom4j/debian/control	2010-06-02 21:43:07 UTC (rev 12536)
+++ trunk/dom4j/debian/control	2010-06-03 14:43:01 UTC (rev 12537)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Marcus Better <marcus at better.se>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 7), ant-optional, openjdk-6-jdk, maven-repo-helper
+Build-Depends: debhelper (>= 7), ant-optional, default-jdk, maven-repo-helper
 Build-Depends-Indep: antlr, libjaxen-java, libjaxme-java, libxpp2-java, libxpp3-java, libxerces2-java, libxalan2-java (>= 2.7.0), libbackport-util-concurrent-java, junit, libjunitperf-java
 Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/dom4j

Modified: trunk/dom4j/debian/rules
===================================================================
--- trunk/dom4j/debian/rules	2010-06-02 21:43:07 UTC (rev 12536)
+++ trunk/dom4j/debian/rules	2010-06-03 14:43:01 UTC (rev 12537)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-JAVA_HOME	:= /usr/lib/jvm/java-6-openjdk
+JAVA_HOME	:= /usr/lib/jvm/default-java
 DEB_JARS_BASE	:= /usr/share/java
 JAVACMD  	:= $(JAVA_HOME)/bin/java