[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#683211: unblock: worldwind/0.5.0-9



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package worldwind. Release 0.5.0-9 fixes bug number #682411
(FTBFS)

unblock worldwind/0.5.0-9

% debdiff ../../../../qa/worldwind/worldwind_0.5.0-8.dsc worldwind_0.5.0-9.dsc
diff -u worldwind-0.5.0/debian/rules worldwind-0.5.0/debian/rules
--- worldwind-0.5.0/debian/rules
+++ worldwind-0.5.0/debian/rules
@@ -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
diff -u worldwind-0.5.0/debian/changelog worldwind-0.5.0/debian/changelog
--- worldwind-0.5.0/debian/changelog
+++ worldwind-0.5.0/debian/changelog
@@ -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@debian.org>  Sun, 29 Jul 2012 22:00:30 +0200
+
 worldwind (0.5.0-8) unstable; urgency=low
 
   * DM-Upload-Allowed removed
only in patch2:
unchanged:
--- worldwind-0.5.0.orig/wms-release.zip.cdbs-config_list
+++ worldwind-0.5.0/wms-release.zip.cdbs-config_list
@@ -0,0 +1 @@
+     2148  2008-05-02 18:04   WEB-INF/config.xml


System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8) (ignored: LC_ALL set to en_US.utf8)
Shell: /bin/sh linked to /bin/bash

Thanks -Ralf.


Reply to: