[freecol] 54/125: [freecol] Fix FTBS with recent openjdk

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository freecol.

commit 07c06844b8dff49b72dbbda57437a045cd7aaee5
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Thu Sep 29 19:55:11 2011 +0000

    [freecol] Fix FTBS with recent openjdk
---
 debian/changelog | 6 ++++++
 debian/rules     | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e9396b9..e1ebcd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+freecol (0.10.0+dfsg-3) unstable; urgency=low
+
+  * Fix FTBS with recent openjdk-6 (closes: #642788)
+
+ -- Vincent Fourmond <fourmond at debian.org>  Thu, 29 Sep 2011 21:40:24 +0200
+
 freecol (0.10.0+dfsg-2) unstable; urgency=low
 
   * Refrain from installing the Liberation fonts, and symlink from those
diff --git a/debian/rules b/debian/rules
index c701506..2cdf718 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/javahelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME_DIRS       := /usr/lib/jvm/java-6-openjdk
+arch = $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+JAVA_HOME_DIRS       := /usr/lib/jvm/java-7-openjdk-$(arch) \
+	/usr/lib/jvm/java-6-openjdk-$(arch) /usr/lib/jvm/java-6-openjdk
 ANT_HOME             := /usr/share/ant
 DEB_JARS             := ant-launcher ant-nodeps \
 	miglayout wstx-lgpl commons-cli cortado

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freecol.git