[pkg-java] r14728 - trunk/mysql-connector-java/debian
Torsten Werner
twerner at alioth.debian.org
Tue Sep 6 19:33:27 UTC 2011
Author: twerner
Date: 2011-09-06 19:33:27 +0000 (Tue, 06 Sep 2011)
New Revision: 14728
Modified:
trunk/mysql-connector-java/debian/changelog
trunk/mysql-connector-java/debian/control
trunk/mysql-connector-java/debian/rules
Log:
* Team upload.
* Switch to default-jdk (Closes: #640619)
Modified: trunk/mysql-connector-java/debian/changelog
===================================================================
--- trunk/mysql-connector-java/debian/changelog 2011-09-06 17:38:18 UTC (rev 14727)
+++ trunk/mysql-connector-java/debian/changelog 2011-09-06 19:33:27 UTC (rev 14728)
@@ -1,3 +1,10 @@
+mysql-connector-java (5.1.16-2) unstable; urgency=low
+
+ * Team upload.
+ * Switch to default-jdk (Closes: #640619)
+
+ -- Torsten Werner <twerner at debian.org> Tue, 06 Sep 2011 21:28:09 +0200
+
mysql-connector-java (5.1.16-1) unstable; urgency=low
* Team upload.
Modified: trunk/mysql-connector-java/debian/control
===================================================================
--- trunk/mysql-connector-java/debian/control 2011-09-06 17:38:18 UTC (rev 14727)
+++ trunk/mysql-connector-java/debian/control 2011-09-06 19:33:27 UTC (rev 14728)
@@ -4,7 +4,7 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Marcus Better <marcus at better.se>, Michael Koch <konqueror at gmx.de>
Build-Depends: debhelper (>= 7), cdbs, ant, java-gcj-compat-dev, ant-optional
-Build-Depends-Indep: openjdk-6-jdk, junit, ant-contrib, maven-repo-helper,
+Build-Depends-Indep: default-jdk, junit, ant-contrib, maven-repo-helper,
libslf4j-java
Standards-Version: 3.9.1
Homepage: http://www.mysql.com/products/connector/j/
Modified: trunk/mysql-connector-java/debian/rules
===================================================================
--- trunk/mysql-connector-java/debian/rules 2011-09-06 17:38:18 UTC (rev 14727)
+++ trunk/mysql-connector-java/debian/rules 2011-09-06 19:33:27 UTC (rev 14728)
@@ -6,7 +6,9 @@
VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/Version: //' | cut -f1 -d- | cut -f1 -d+)
JAVA_HOME := /usr/lib/jvm/java-gcj
-JAVA6_HOME := /usr/lib/jvm/java-6-openjdk
+#quick fix for #640619
+#JAVA6_HOME := /usr/lib/jvm/java-6-openjdk
+JAVA6_HOME := /usr/lib/jvm/default-java
DEB_JARS := ant ant-launcher ant-junit junit ant-contrib slf4j-api
DEB_ANT_ARGS := -Dcom.mysql.jdbc.java6.javac=$(JAVA6_HOME)/bin/javac \
More information about the pkg-java-commits
mailing list