[pkg-java] r16211 - in trunk/mysql-connector-java/debian: . patches

[Miguel Landaeta]

Author: nomadium-guest
Date: 2012-06-28 19:46:36 +0000 (Thu, 28 Jun 2012)
New Revision: 16211

Added:
   trunk/mysql-connector-java/debian/patches/0002-java7-compat.patch
Modified:
   trunk/mysql-connector-java/debian/changelog
   trunk/mysql-connector-java/debian/control
   trunk/mysql-connector-java/debian/patches/series
Log:
* Team upload.
* Fix FTBFS with OpenJDK 7.
* Bump Standards-Version to 3.9.3. No changes were required.
* Remove Michael Koch from Uploaders list.
  Thanks for your work on this package. (Closes: #654122).


Modified: trunk/mysql-connector-java/debian/changelog
===================================================================
--- trunk/mysql-connector-java/debian/changelog	2012-06-26 03:31:23 UTC (rev 16210)
+++ trunk/mysql-connector-java/debian/changelog	2012-06-28 19:46:36 UTC (rev 16211)
@@ -1,3 +1,13 @@
+mysql-connector-java (5.1.16-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Fix FTBFS with OpenJDK 7.
+  * Bump Standards-Version to 3.9.3. No changes were required.
+  * Remove Michael Koch from Uploaders list.
+    Thanks for your work on this package. (Closes: #654122).
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Wed, 27 Jun 2012 23:37:41 -0430
+
 mysql-connector-java (5.1.16-2) unstable; urgency=low
 
   * Team upload.

Modified: trunk/mysql-connector-java/debian/control
===================================================================
--- trunk/mysql-connector-java/debian/control	2012-06-26 03:31:23 UTC (rev 16210)
+++ trunk/mysql-connector-java/debian/control	2012-06-28 19:46:36 UTC (rev 16211)
@@ -2,11 +2,11 @@
 Section: java
 Priority: optional
 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>
+Uploaders: Marcus Better <marcus at better.se>
 Build-Depends: debhelper (>= 7), cdbs, ant, java-gcj-compat-dev, ant-optional
 Build-Depends-Indep: default-jdk, junit, ant-contrib, maven-repo-helper,
  libslf4j-java
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Homepage: http://www.mysql.com/products/connector/j/
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/mysql-connector-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/mysql-connector-java/

Added: trunk/mysql-connector-java/debian/patches/0002-java7-compat.patch
===================================================================
--- trunk/mysql-connector-java/debian/patches/0002-java7-compat.patch	                        (rev 0)
+++ trunk/mysql-connector-java/debian/patches/0002-java7-compat.patch	2012-06-28 19:46:36 UTC (rev 16211)
@@ -0,0 +1,32 @@
+Description: Dummy compatibility patch with Java7 APIs
+Author: Miguel Landaeta <miguel at miguel.cc>
+Forwarded: no
+Last-Update: 2012-06-27
+
+--- mysql-connector-java-5.1.16.orig/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java
++++ mysql-connector-java-5.1.16/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java
+@@ -129,4 +129,24 @@ public class JDBC4LoadBalancedMySQLConne
+ 		return this.getJDBC4Connection().getClientInfoProviderImpl();
+ 	
+ 	}
++
++	public void setSchema(String schema) throws SQLException {
++		throw new UnsupportedOperationException("setSchema");
++	}
++
++	public String getSchema() throws SQLException {
++		throw new UnsupportedOperationException("getSchema");
++	}
++
++	public void abort(java.util.concurrent.Executor executor) throws SQLException {
++		throw new UnsupportedOperationException("abort");
++	}
++
++	public void setNetworkTimeout(java.util.concurrent.Executor executor, int milliseconds) throws SQLException {
++		throw new UnsupportedOperationException("setNetworkTimeout");
++	}
++
++	public int getNetworkTimeout() throws SQLException {
++		throw new UnsupportedOperationException("getNetworkTimeout");
++	}
+ }

Modified: trunk/mysql-connector-java/debian/patches/series
===================================================================
--- trunk/mysql-connector-java/debian/patches/series	2012-06-26 03:31:23 UTC (rev 16210)
+++ trunk/mysql-connector-java/debian/patches/series	2012-06-28 19:46:36 UTC (rev 16211)
@@ -1 +1,2 @@
 0001-disable-testsuite.patch
+0002-java7-compat.patch