Author: fourmond
Date: 2011-09-29 19:43:19 +0000 (Thu, 29 Sep 2011)
New Revision: 15128
Modified:
trunk/batik/debian/changelog
trunk/batik/debian/control
trunk/batik/debian/rules
Log:
[batik] Fix FTBS with recent openjdk
Modified: trunk/batik/debian/changelog
===================================================================
--- trunk/batik/debian/changelog 2011-09-29 19:42:48 UTC (rev 15127)
+++ trunk/batik/debian/changelog 2011-09-29 19:43:19 UTC (rev 15128)
@@ -1,3 +1,10 @@
+batik (1.7-8) unstable; urgency=low
+
+ * Fix FTBS with recent openjdk (closes: #643508)
+ * Bump to newer standards version, no changes required
+
+ -- Vincent Fourmond <fourm...@debian.org> Thu, 29 Sep 2011 21:35:31 +0200
+
batik (1.7-7) unstable; urgency=low
* Re-enable all patches that had mistakenly been disabled by switching to
Modified: trunk/batik/debian/control
===================================================================
--- trunk/batik/debian/control 2011-09-29 19:42:48 UTC (rev 15127)
+++ trunk/batik/debian/control 2011-09-29 19:43:19 UTC (rev 15128)
@@ -4,7 +4,7 @@
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Wolfgang Baer <wb...@gmx.de>, Michael Koch <konque...@gmx.de>,
Vincent Fourmond <fourm...@debian.org>, Onkar Shinde <onkarshi...@ubuntu.com>
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Build-Depends: debhelper (>= 5.0), cdbs
Build-Depends-Indep: openjdk-6-jdk | sun-java5-jdk | sun-java6-jdk, ant,
libbsf-java, libxalan2-java, rhino, libavalon-framework-java (>= 4.2.0),
Modified: trunk/batik/debian/rules
===================================================================
--- trunk/batik/debian/rules 2011-09-29 19:42:48 UTC (rev 15127)
+++ trunk/batik/debian/rules 2011-09-29 19:43:19 UTC (rev 15128)
@@ -9,7 +9,10 @@
include /usr/share/cdbs/1/rules/debhelper.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 \
/usr/lib/jvm/java-1.5.0-sun /usr/lib/jvm/java-6-sun
ANT_HOME := /usr/share/ant
DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar bfs \
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
