This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository mysql-connector-java.
commit ad1b1188531d91d35da4f542ac3c1f7c875b048d Author: Emmanuel Bourg <[email protected]> Date: Thu Dec 10 23:56:31 2015 +0100 Refreshed the patches --- debian/changelog | 8 +++ debian/patches/0001-disable-testsuite.patch | 2 +- debian/patches/0002-java6-compilation-compat.patch | 77 +++------------------- debian/patches/0003-disable-hibernate-fabric.patch | 6 +- debian/patches/0004-skip-jdk-check.patch | 2 +- 5 files changed, 22 insertions(+), 73 deletions(-) diff --git a/debian/changelog b/debian/changelog index 17731d8..daee6bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mysql-connector-java (5.1.38-1) UNRELEASED; urgency=medium + + * Team upload. + * New upstream release + - Refreshed the patches + + -- Emmanuel Bourg <[email protected]> Thu, 10 Dec 2015 23:52:57 +0100 + mysql-connector-java (5.1.37-1) experimental; urgency=medium * New upstream release diff --git a/debian/patches/0001-disable-testsuite.patch b/debian/patches/0001-disable-testsuite.patch index 8a774dc..b4b3772 100644 --- a/debian/patches/0001-disable-testsuite.patch +++ b/debian/patches/0001-disable-testsuite.patch @@ -8,7 +8,7 @@ Subject: [PATCH] disable testsuite --- a/build.xml +++ b/build.xml -@@ -804,7 +804,7 @@ +@@ -807,7 +807,7 @@ <!-- Compile the driver including JDBC 3 and JDBC 4+ implementations, JUnit test suite and 'helpers' for third-party software. --> <target name="compile" description="Compiles driver including JDBC 3 and JDBC 4+ implementations, JUnit test suite and integration 'helpers' for third-party software." diff --git a/debian/patches/0002-java6-compilation-compat.patch b/debian/patches/0002-java6-compilation-compat.patch index 0a5f5c3..00ccaae 100644 --- a/debian/patches/0002-java6-compilation-compat.patch +++ b/debian/patches/0002-java6-compilation-compat.patch @@ -25,7 +25,7 @@ Subject: [PATCH] Java 8 compatibility --- a/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java +++ b/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java -@@ -2999,4 +2999,36 @@ +@@ -3057,4 +3057,36 @@ public void decachePreparedStatement(ServerPreparedStatement pstmt) throws SQLException { } @@ -169,7 +169,7 @@ Subject: [PATCH] Java 8 compatibility */ --- a/src/com/mysql/jdbc/ConnectionImpl.java +++ b/src/com/mysql/jdbc/ConnectionImpl.java -@@ -5586,4 +5586,56 @@ +@@ -5587,4 +5587,56 @@ public void setProfilerEventHandlerInstance(ProfilerEventHandler h) { this.eventSink = h; } @@ -253,9 +253,9 @@ Subject: [PATCH] Java 8 compatibility * --- a/src/com/mysql/jdbc/MultiHostMySQLConnection.java +++ b/src/com/mysql/jdbc/MultiHostMySQLConnection.java -@@ -2427,4 +2427,56 @@ - public void setEnableEscapeProcessing(boolean flag) { - getActiveMySQLConnection().setEnableEscapeProcessing(flag); +@@ -2467,4 +2467,56 @@ + public boolean isUseSSLExplicit() { + return getActiveMySQLConnection().isUseSSLExplicit(); } + + public java.sql.Clob createClob() throws SQLException { @@ -312,7 +312,7 @@ Subject: [PATCH] Java 8 compatibility } --- a/src/com/mysql/jdbc/NonRegisteringDriver.java +++ b/src/com/mysql/jdbc/NonRegisteringDriver.java -@@ -906,4 +906,9 @@ +@@ -900,4 +900,9 @@ } } } @@ -343,65 +343,6 @@ Subject: [PATCH] Java 8 compatibility /** * JDBC 4.2 * Same as PreparedStatement.executeUpdate() but returns long instead of int. ---- a/src/com/mysql/jdbc/ReplicationConnection.java -+++ b/src/com/mysql/jdbc/ReplicationConnection.java -@@ -3030,4 +3030,56 @@ - public void setEnableEscapeProcessing(boolean flag) { - getCurrentConnection().setEnableEscapeProcessing(flag); - } -+ -+ public java.sql.Clob createClob() throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public java.sql.Blob createBlob() throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public java.sql.NClob createNClob() throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public java.sql.SQLXML createSQLXML() throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public boolean isValid(int timeout) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void setClientInfo(String name, String value) throws java.sql.SQLClientInfoException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void setClientInfo(Properties properties) throws java.sql.SQLClientInfoException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public String getClientInfo(String name) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public Properties getClientInfo() throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public java.sql.Struct createStruct(String typeName, Object[] attributes) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public <T> T unwrap(Class<T> iface) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public boolean isWrapperFor(Class<?> iface) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } - } --- a/src/com/mysql/jdbc/ResultSetImpl.java +++ b/src/com/mysql/jdbc/ResultSetImpl.java @@ -7923,4 +7923,200 @@ @@ -752,9 +693,9 @@ Subject: [PATCH] Java 8 compatibility // try { --- a/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java +++ b/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java -@@ -2852,4 +2852,56 @@ - public void setEnableEscapeProcessing(boolean flag) { - this.mc.setEnableEscapeProcessing(flag); +@@ -2872,4 +2872,56 @@ + public boolean isUseSSLExplicit() { + return this.mc.isUseSSLExplicit(); } + + public java.sql.Clob createClob() throws SQLException { diff --git a/debian/patches/0003-disable-hibernate-fabric.patch b/debian/patches/0003-disable-hibernate-fabric.patch index 919ce59..30270f2 100644 --- a/debian/patches/0003-disable-hibernate-fabric.patch +++ b/debian/patches/0003-disable-hibernate-fabric.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -218,6 +218,7 @@ +@@ -219,6 +219,7 @@ </not> </condition> </fail> @@ -11,7 +11,7 @@ Forwarded: not-needed <fail message="Hibernate libraries, required for build tasks, must be in the directory '${com.mysql.jdbc.extra.libs}/hibernate4'."> <condition> <not> -@@ -225,6 +226,7 @@ +@@ -226,6 +227,7 @@ </not> </condition> </fail> @@ -19,7 +19,7 @@ Forwarded: not-needed </target> -@@ -857,8 +859,10 @@ +@@ -860,8 +862,10 @@ bootclasspath="${com.mysql.jdbc.jre6.rtjar}" source="1.6" target="1.6"> diff --git a/debian/patches/0004-skip-jdk-check.patch b/debian/patches/0004-skip-jdk-check.patch index 8e74efa..71db8ff 100644 --- a/debian/patches/0004-skip-jdk-check.patch +++ b/debian/patches/0004-skip-jdk-check.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -389,7 +389,7 @@ +@@ -390,7 +390,7 @@ <!-- Prepares files and settings for compiling driver. --> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mysql-connector-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
