[libjibx1.2-java] 09/33: Switch to 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 libjibx1.2-java.

commit b18a8af878100886857ea0c35b86e676322c4f27
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Tue Sep 27 20:14:44 2011 +0000

    Switch to default-jdk
---
 debian/changelog | 7 +++++++
 debian/control   | 2 +-
 debian/rules     | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b210e31..864ed16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libjibx1.2-java (1.2.3-2) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Switch to default-jdk. (Closes: #643532).
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Tue, 27 Sep 2011 20:38:31 -0430
+
 libjibx1.2-java (1.2.3-1) unstable; urgency=low
 
   * Team upload
diff --git a/debian/control b/debian/control
index 8b4d12c..ef155a1 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: Eric Lavarde <deb at zorglub.s.bawue.de>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 7.0.0), cdbs (>= 0.4.8), openjdk-6-jdk, ant, quilt
+Build-Depends: debhelper (>= 7.0.0), cdbs (>= 0.4.8), default-jdk, ant, quilt
 Build-Depends-Indep: antlr, libbcel-java, liblog4j1.2-java, libxpp3-java,
  libjoda-time-java
 Standards-Version: 3.9.1
diff --git a/debian/rules b/debian/rules
index fcaa417..df6ae1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 DEB_COMPRESS_EXCLUDE := .class
-JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
+JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar bcel log4j-1.2 qdox xpp3 joda-time
 DEB_ANT_BUILD_TARGET := setrelease current devdoc
 DEB_ANT_ARGS         := -Dbindname=jibx-bind-$(DEB_UPSTREAM_VERSION) -Dextrasname=jibx-extras-$(DEB_UPSTREAM_VERSION) -Drunname=jibx-run-$(DEB_UPSTREAM_VERSION) -Dschemaname=jibx-schema-$(DEB_UPSTREAM_VERSION)

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