Bug#642770: [patch] libgdata-java: FTBFS: You must specify a valid JAVA_HOME or JAVACMD

[Hideki Yamane <henrich@debian.or.jp>]

tags 642770 patch
thanks

Hi,

 I've made a patch for fix FTBFS by adjusting JAVA_HOME path.
 Please check it, thanks.


-- 
Regards,

 Hideki Yamane     henrich @ debian.or.jp/org
 http://wiki.debian.org/HidekiYamane

diff -u libgdata-java-1.30.0/debian/changelog libgdata-java-1.30.0/debian/changelog
--- libgdata-java-1.30.0/debian/changelog
+++ libgdata-java-1.30.0/debian/changelog
@@ -1,3 +1,11 @@
+libgdata-java (1.30.0-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/rules
+    - adjust JAVA_HOME for each architecture (Closes: #642770)
+
+ -- Hideki Yamane <henrich@debian.org>  Sun, 01 Jan 2012 22:45:34 +0900
+
 libgdata-java (1.30.0-2) unstable; urgency=low
 
   * QA upload.
diff -u libgdata-java-1.30.0/debian/rules libgdata-java-1.30.0/debian/rules
--- libgdata-java-1.30.0/debian/rules
+++ libgdata-java-1.30.0/debian/rules
@@ -3,7 +3,9 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME  		:= /usr/lib/jvm/java-6-openjdk
+DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+JAVA_HOME  		:= /usr/lib/jvm/java-6-openjdk-$(DEB_BUILD_ARCH)
 DEB_SRCDIR 		:= java
 DEB_ANT_BUILDFILE	:= build-src.xml
 ANT_OPTS		:= -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5