[SCM] lwjgl - Lightweight Java Game Library branch, master, updated. upstream/2.5+dfsg-36-g15abe79

[Miguel Landaeta]

The following commit has been merged in the master branch:
commit f026f247f83b31d46e402873a27b3d6945a3e26c
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Sun Oct 23 13:01:43 2011 -0430

    Switch to default-jdk

diff --git a/debian/changelog b/debian/changelog
index 03c109f..6fb2cdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lwjgl (2.7.1+dfsg-2) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Switch to default-jdk. (Closes: #643537).
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Sun, 23 Oct 2011 12:51:29 -0430
+
 lwjgl (2.7.1+dfsg-1) unstable; urgency=low
 
   [ Michael Gilbert ]
diff --git a/debian/control b/debian/control
index e1f00fc..bb4b5e5 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  javahelper,
  ant,
  ant-optional,
- openjdk-6-jdk,
+ default-jdk,
  libjinput-java,
  libxrandr-dev,
  libxxf86vm-dev,
diff --git a/debian/rules b/debian/rules
index 0ab0f14..dd76869 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ TMPDIR  := $(NAME)-$(VERSION)
 TAR     := ../$(NAME)_$(VERSION).orig.tar.gz
 TARDFSG := ../$(NAME)_$(VERSION)+dfsg.orig.tar.gz
 
-export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+export JAVA_HOME=/usr/lib/jvm/default-java
 
 # NOTE: jutils is explicitly included here (without a depends in our control
 # file) because jinput.jar lacks jutils in its own "Class-Path" (bug #626002)

-- 
lwjgl - Lightweight Java Game Library