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

[Miguel Landaeta]

On Sun, Jan 01, 2012 at 10:05:56PM +0900, Hideki Yamane wrote:
 tags 642759 patch
 thanks
 
 Hi,
 
  I've made a patch for fix FTBFS by adjusting JAVA_HOME path.
  Please check it, thanks.

I think the preferable way to fix these kind of bugs is by switching
to B-D on default-jdk and point JAVA_HOME path to /usr/lib/jvm/default-java.

I'm including a new patch.

-- 
Miguel Landaeta, miguel at miguel.cc
secure email with PGP 0x7D8967E9 available at http://keyserver.pgp.com/
Faith means not wanting to know what is true. -- Nietzsche
diff -Nru tinylaf-1.4.0/debian/changelog tinylaf-1.4.0/debian/changelog
--- tinylaf-1.4.0/debian/changelog  2012-01-16 20:13:46.0 -0430
+++ tinylaf-1.4.0/debian/changelog  2012-01-16 20:09:50.0 -0430
@@ -1,3 +1,11 @@
+tinylaf (1.4.0-3) unstable; urgency=low
+
+  * QA upload.
+  * Switch to default-jdk. (Closes: #642759).
+  * Switch to source format 3.0 (quilt).
+
+ -- Miguel Landaeta mig...@miguel.cc  Mon, 16 Jan 2012 20:08:27 -0430
+
 tinylaf (1.4.0-2) unstable; urgency=low
 
   * QA upload.
diff -Nru tinylaf-1.4.0/debian/control tinylaf-1.4.0/debian/control
--- tinylaf-1.4.0/debian/control2012-01-16 20:13:46.0 -0430
+++ tinylaf-1.4.0/debian/control2012-01-16 20:07:44.0 -0430
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Debian QA Group packa...@qa.debian.org
-Build-Depends: cdbs, debhelper (= 7), ant, openjdk-6-jdk
+Build-Depends: cdbs, debhelper (= 7), ant, default-jdk
 Standards-Version: 3.8.3
 Homepage: http://www.muntjak.de/hans/java/tinylaf/index.html
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/tinylaf
diff -Nru tinylaf-1.4.0/debian/rules tinylaf-1.4.0/debian/rules
--- tinylaf-1.4.0/debian/rules  2012-01-16 20:13:46.0 -0430
+++ tinylaf-1.4.0/debian/rules  2012-01-16 20:07:27.0 -0430
@@ -3,7 +3,7 @@
 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
+JAVA_HOME_DIRS   := /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET := dist
 ANT_OPTS:= -Dant.build.javac.source=1.5 
-Dant.build.javac.target=1.5
 
diff -Nru tinylaf-1.4.0/debian/source/format tinylaf-1.4.0/debian/source/format
--- tinylaf-1.4.0/debian/source/format  1969-12-31 20:00:00.0 -0400
+++ tinylaf-1.4.0/debian/source/format  2012-01-16 20:08:23.0 -0430
@@ -0,0 +1 @@
+3.0 (quilt)


signature.asc
Description: Digital signature

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

[Hideki Yamane]

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 henr...@debian.org  Sun, 01 Jan 2012 22:00:37 +0900
+
 tinylaf (1.4.0-2) unstable; urgency=low
 
   * QA upload.