r7076 - packages/trunk/freecol/debian

[Vincent Fourmond]

Author: fourmond
Date: 2008-05-16 18:34:24 +0000 (Fri, 16 May 2008)
New Revision: 7076

Modified:
   packages/trunk/freecol/debian/changelog
   packages/trunk/freecol/debian/rules
Log:
[freecol] Adding openjdk also to debian/rules

Modified: packages/trunk/freecol/debian/changelog
===================================================================
--- packages/trunk/freecol/debian/changelog	2008-05-16 18:19:04 UTC (rev 7075)
+++ packages/trunk/freecol/debian/changelog	2008-05-16 18:34:24 UTC (rev 7076)
@@ -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
 

Modified: packages/trunk/freecol/debian/rules
===================================================================
--- packages/trunk/freecol/debian/rules	2008-05-16 18:19:04 UTC (rev 7075)
+++ packages/trunk/freecol/debian/rules	2008-05-16 18:34:24 UTC (rev 7076)
@@ -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