[dom4j] 39/74: debian/control, debian/rules: Build with default-jdk

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository dom4j.

commit 414957aeaa35c2a145594283e392e1d0e9a97df6
Author: Thierry Carrez <thierry.carrez at ubuntu.com>
Date:   Thu Jun 3 14:43:01 2010 +0000

    debian/control, debian/rules: Build with default-jdk
---
 debian/changelog | 6 ++++++
 debian/control   | 2 +-
 debian/rules     | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9e87944..43936ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
diff --git a/debian/control b/debian/control
index 927df33..f14595f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 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
diff --git a/debian/rules b/debian/rules
index ee5f5dc..2ae18c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/dom4j.git