[pkg-java] r14777 - trunk/java3d/debian

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-09-09 01:46:52 +0000 (Fri, 09 Sep 2011)
New Revision: 14777

Modified:
   trunk/java3d/debian/changelog
   trunk/java3d/debian/control
   trunk/java3d/debian/rules
Log:
Switch to default-jdk

Modified: trunk/java3d/debian/changelog
===================================================================
--- trunk/java3d/debian/changelog	2011-09-08 21:43:57 UTC (rev 14776)
+++ trunk/java3d/debian/changelog	2011-09-09 01:46:52 UTC (rev 14777)
@@ -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 ]

Modified: trunk/java3d/debian/control
===================================================================
--- trunk/java3d/debian/control	2011-09-08 21:43:57 UTC (rev 14776)
+++ trunk/java3d/debian/control	2011-09-09 01:46:52 UTC (rev 14777)
@@ -4,7 +4,7 @@
 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/

Modified: trunk/java3d/debian/rules
===================================================================
--- trunk/java3d/debian/rules	2011-09-08 21:43:57 UTC (rev 14776)
+++ trunk/java3d/debian/rules	2011-09-09 01:46:52 UTC (rev 14777)
@@ -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