[mysql-connector-java] 02/03: Refreshed the patches

[Emmanuel Bourg]

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 b43e828902ef5e67640031913b6cec35800a9499
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Mar 8 10:53:08 2017 +0100

    Refreshed the patches
---
 debian/changelog                                   |  8 ++++++++
 debian/patches/0001-disable-testsuite.patch        |  2 +-
 debian/patches/0002-java6-compilation-compat.patch | 14 +++++++-------
 debian/patches/0003-disable-hibernate-fabric.patch |  2 +-
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e20c0be..d85b477 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mysql-connector-java (5.1.41-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 08 Mar 2017 10:51:27 +0100
+
 mysql-connector-java (5.1.40-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/0001-disable-testsuite.patch b/debian/patches/0001-disable-testsuite.patch
index 9015e7b..3f8c393 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
-@@ -833,7 +833,7 @@
+@@ -835,7 +835,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 e445743..b6a6471 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
-@@ -3050,4 +3050,36 @@
+@@ -3065,4 +3065,36 @@
  
      public void decachePreparedStatement(ServerPreparedStatement pstmt) throws SQLException {
      }
@@ -169,9 +169,9 @@ Subject: [PATCH] Java 8 compatibility
       */
 --- a/src/com/mysql/jdbc/ConnectionImpl.java
 +++ b/src/com/mysql/jdbc/ConnectionImpl.java
-@@ -5550,4 +5550,56 @@
-     public void setProfilerEventHandlerInstance(ProfilerEventHandler h) {
-         this.eventSink = h;
+@@ -5507,4 +5507,56 @@
+             }
+         }
      }
 +
 +    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 @@
+@@ -908,4 +908,9 @@
              }
          }
      }
@@ -324,7 +324,7 @@ Subject: [PATCH] Java 8 compatibility
  }
 --- a/src/com/mysql/jdbc/PreparedStatement.java
 +++ b/src/com/mysql/jdbc/PreparedStatement.java
-@@ -5090,6 +5090,18 @@
+@@ -5096,6 +5096,18 @@
                  && StringUtils.indexOfIgnoreCase(statementStartPos, sql, "SELECT", "\"'`", "\"'`", StringUtils.SEARCH_MODE__MRK_COM_WS) == -1;
      }
  
@@ -345,7 +345,7 @@ Subject: [PATCH] Java 8 compatibility
       * Same as PreparedStatement.executeUpdate() but returns long instead of int.
 --- a/src/com/mysql/jdbc/ResultSetImpl.java
 +++ b/src/com/mysql/jdbc/ResultSetImpl.java
-@@ -7906,4 +7906,200 @@
+@@ -7908,4 +7908,200 @@
      protected ExceptionInterceptor getExceptionInterceptor() {
          return this.exceptionInterceptor;
      }
diff --git a/debian/patches/0003-disable-hibernate-fabric.patch b/debian/patches/0003-disable-hibernate-fabric.patch
index 130355b..3d01023 100644
--- a/debian/patches/0003-disable-hibernate-fabric.patch
+++ b/debian/patches/0003-disable-hibernate-fabric.patch
@@ -19,7 +19,7 @@ Forwarded: not-needed
      </target>
  
  
-@@ -887,8 +889,10 @@
+@@ -889,8 +891,10 @@
                 bootclasspath="${com.mysql.jdbc.jre6.rtjar}"
                 source="1.6"
                 target="1.6">

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mysql-connector-java.git