r45284 - in /packages/worldwind/trunk/debian: changelog rules

[treinen at users.alioth.debian.org]

Author: treinen
Date: Mon Jul 30 19:03:18 2012
New Revision: 45284

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45284
Log:
set JAVA_HOME to /usr/lib/jvm/default-java

Modified:
    packages/worldwind/trunk/debian/changelog
    packages/worldwind/trunk/debian/rules

Modified: packages/worldwind/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/worldwind/trunk/debian/changelog?rev=45284&op=diff
==============================================================================
--- packages/worldwind/trunk/debian/changelog (original)
+++ packages/worldwind/trunk/debian/changelog Mon Jul 30 19:03:18 2012
@@ -1,3 +1,10 @@
+worldwind (0.5.0-10) unstable; urgency=low
+
+  * debian/rules: really fix JAVA_HOME by setting to /usr/lib/jvm/default-java/
+    Thanks to Sylvestre Ledru for the indication.
+
+ -- Ralf Treinen <treinen at debian.org>  Mon, 30 Jul 2012 21:02:24 +0200
+
 worldwind (0.5.0-9) unstable; urgency=low
 
   * Team upload

Modified: packages/worldwind/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/worldwind/trunk/debian/rules?rev=45284&op=diff
==============================================================================
--- packages/worldwind/trunk/debian/rules (original)
+++ packages/worldwind/trunk/debian/rules Mon Jul 30 19:03:18 2012
@@ -6,8 +6,7 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 # This software doesn't compile (at the moment) with gcj
-BUILDARCH            ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-JAVA_HOME            =  /usr/lib/jvm/java-6-openjdk-$(BUILDARCH)/
+JAVA_HOME            := /usr/lib/jvm/default-java/
 DEB_JARS             := ant-nodeps jogl gluegen-rt
 DEB_ANT_BUILD_TARGET := build
 DEB_ANT_CLEAN_TARGET := clean.all