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

[treinen at users.alioth.debian.org]

Author: treinen
Date: Sun Jul 29 20:07:01 2012
New Revision: 45279

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45279
Log:
debian/rules: fix JAVA_HOME variable
This line, and those below, will be ignored--

M    worldwind/trunk/debian/changelog
M    worldwind/trunk/debian/rules

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=45279&op=diff
==============================================================================
--- packages/worldwind/trunk/debian/changelog (original)
+++ packages/worldwind/trunk/debian/changelog Sun Jul 29 20:07:01 2012
@@ -1,3 +1,11 @@
+worldwind (0.5.0-9) unstable; urgency=low
+
+  * Team upload
+  * debian/rules: use the build-architecture to determine the correct value
+    of JAVA_HOME (closes: #682411)
+
+ -- Ralf Treinen <treinen at debian.org>  Sun, 29 Jul 2012 22:00:30 +0200
+
 worldwind (0.5.0-8) unstable; urgency=low
 
   * DM-Upload-Allowed removed

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