Bug#642759: [patch] tinylaf: FTBFS: You must specify a valid JAVA_HOME or JAVACMD

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

tags 642759 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 tinylaf-1.4.0/debian/rules tinylaf-1.4.0/debian/rules
--- tinylaf-1.4.0/debian/rules
+++ tinylaf-1.4.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_DIRS       := /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-1.5.0-sun
+DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+JAVA_HOME_DIRS       := /usr/lib/jvm/java-6-openjdk-$(DEB_BUILD_ARCH) /usr/lib/jvm/java-1.5.0-sun
 DEB_ANT_BUILD_TARGET := dist
 ANT_OPTS	     := -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
 
diff -u tinylaf-1.4.0/debian/changelog tinylaf-1.4.0/debian/changelog
--- tinylaf-1.4.0/debian/changelog
+++ tinylaf-1.4.0/debian/changelog
@@ -1,3 +1,12 @@
+tinylaf (1.4.0-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/rules
+    - Fix "FTBFS: You must specify a valid JAVA_HOME or JAVACMD" by adjusting
+      JAVA_HOME (Closes: #642759)
+
+ -- Hideki Yamane <henrich@debian.org>  Sun, 01 Jan 2012 22:00:37 +0900
+
 tinylaf (1.4.0-2) unstable; urgency=low
 
   * QA upload.