Author: fourmond Date: 2011-09-29 19:55:11 +0000 (Thu, 29 Sep 2011) New Revision: 12689
Modified: packages/trunk/freecol/debian/changelog packages/trunk/freecol/debian/rules Log: [freecol] Fix FTBS with recent openjdk Modified: packages/trunk/freecol/debian/changelog =================================================================== --- packages/trunk/freecol/debian/changelog 2011-09-25 22:51:45 UTC (rev 12688) +++ packages/trunk/freecol/debian/changelog 2011-09-29 19:55:11 UTC (rev 12689) @@ -1,3 +1,9 @@ +freecol (0.10.0+dfsg-3) unstable; urgency=low + + * Fix FTBS with recent openjdk-6 (closes: #642788) + + -- Vincent Fourmond <[email protected]> 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 Modified: packages/trunk/freecol/debian/rules =================================================================== --- packages/trunk/freecol/debian/rules 2011-09-25 22:51:45 UTC (rev 12688) +++ packages/trunk/freecol/debian/rules 2011-09-29 19:55:11 UTC (rev 12689) @@ -15,7 +15,10 @@ 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 _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
