[pkg-java] r15122 - trunk/jsymphonic/debian

[Vincent Fourmond]

Author: fourmond
Date: 2011-09-29 19:21:24 +0000 (Thu, 29 Sep 2011)
New Revision: 15122

Modified:
   trunk/jsymphonic/debian/changelog
   trunk/jsymphonic/debian/rules
Log:
[jsymphonic] Fix FTBS with recent openjdk

Modified: trunk/jsymphonic/debian/changelog
===================================================================
--- trunk/jsymphonic/debian/changelog	2011-09-29 19:17:33 UTC (rev 15121)
+++ trunk/jsymphonic/debian/changelog	2011-09-29 19:21:24 UTC (rev 15122)
@@ -1,3 +1,9 @@
+jsymphonic (0.3.0.Ode.To.Freedom+svn387-7) unstable; urgency=medium
+
+  * Fix FTBS with newer openJDK directory layout (closes: #643517)
+
+ -- Vincent Fourmond <fourmond at debian.org>  Thu, 29 Sep 2011 21:15:08 +0200
+
 jsymphonic (0.3.0.Ode.To.Freedom+svn387-6) unstable; urgency=low
 
   * Rebuild with newer javahelper to avoid /usr/share/java/jsymphonic.jar

Modified: trunk/jsymphonic/debian/rules
===================================================================
--- trunk/jsymphonic/debian/rules	2011-09-29 19:17:33 UTC (rev 15121)
+++ trunk/jsymphonic/debian/rules	2011-09-29 19:21:24 UTC (rev 15122)
@@ -12,7 +12,7 @@
 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
+JAVA_HOME_DIRS       := /usr/lib/jvm/java-6-openjdk-$(shell dpkg-architecture -qDEB_HOST_ARCH)
 ANT_HOME             := /usr/share/ant
 DEB_ANT_COMPILER     := modern
 DEB_BUILDDIR         := .