[freecol] 28/125: [freecol] Adding openjdk also to debian/rules

[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 46957006a8897ed1092d6075529335916e50c516
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Fri May 16 18:34:24 2008 +0000

    [freecol] Adding openjdk also to debian/rules
---
 debian/changelog | 6 +++---
 debian/rules     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9f192d3..0351ca3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-freecol (0.7.3-4) UNRELEASED; urgency=low
+freecol (0.7.3-4) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Mmmm, also add openjdk-6 as JAVA_HOME in debian/rules (closes: #480107)
 
- -- Vincent Fourmond <fourmond at debian.org>  Thu, 15 May 2008 17:34:59 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Fri, 16 May 2008 19:21:43 +0200
 
 freecol (0.7.3-3) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index ee0986d..256efe3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@
 include /usr/share/dpatch/dpatch.make
 
 SOURCE_VERSION = $(shell dpkg-parsechangelog | egrep '^Version' | egrep -o '[0-9][^-]+' | head -n 1)
-JAVA_HOME = $(or $(shell [ -x /usr/lib/jvm/java-6-sun/lib ] && echo "/usr/lib/jvm/java-6-sun"), /usr/lib/jvm/java-7-icedtea)
+JAVA_HOME = $(or $(shell [ -x /usr/lib/jvm/java-6-sun/lib ] && echo "/usr/lib/jvm/java-6-sun"), $(shell [ -x /usr/lib/jvm/java-6-openjdk/lib ] && echo "/usr/lib/jvm/java-6-openjdk"), /usr/lib/jvm/java-7-icedtea)
 ANT = JAVA_HOME=$(JAVA_HOME) TEX4HTENV=/etc/tex4ht/tex4ht.env ant
 
 build: build-stamp

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