[java3d] 54/77: 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 java3d.

commit fda0114517066abd8f940d6765e5746ad053cb83
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Fri Sep 9 01:46:52 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 7865ac0..c8c6f27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+java3d (1.5.2+dfsg-7) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Switch to default-jdk. (Closes: #640937).
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Thu, 08 Sep 2011 19:56:44 -0430
+
 java3d (1.5.2+dfsg-6) unstable; urgency=low
 
   [ Jonny Lamb ]
diff --git a/debian/control b/debian/control
index 98fbe96..cc3d457 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Onkar Shinde <onkarshinde at ubuntu.com>,
  Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, openjdk-6-jdk, ant-optional, libvecmath-java, mesa-common-dev, libgl1-mesa-dev, libxext-dev, libxt-dev
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant-optional, libvecmath-java, mesa-common-dev, libgl1-mesa-dev, libxext-dev, libxt-dev
 Standards-Version: 3.9.1
 Homepage: http://java3d.dev.java.net
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/java3d/
diff --git a/debian/rules b/debian/rules
index e9dbde0..5c412db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
+JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := ant-nodeps vecmath
 DEB_ANT_BUILDFILE    := j3d-core/build.xml
 DEB_ANT_CLEAN_TARGET := clean

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