[mysql-connector-java] 04/05: Refreshed the patches

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Jun 20 16:04:28 UTC 2016 

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 bde9cd9cc4da8440f2cc16300e7889c3ab769322
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jun 20 18:02:25 2016 +0200

    Refreshed the patches
---
 debian/changelog                                   |  4 +++-
 debian/patches/0001-disable-testsuite.patch        |  2 +-
 debian/patches/0002-java6-compilation-compat.patch | 24 +++++++++++-----------
 debian/patches/0003-disable-hibernate-fabric.patch |  6 +++---
 debian/patches/0004-skip-jdk-check.patch           |  2 +-
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9d078f5..dffefac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-mysql-connector-java (5.1.38-2) UNRELEASED; urgency=medium
+mysql-connector-java (5.1.39-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Standards-Version updated to 3.9.8 (no changes)
   * Use a secure Vcs-Git URL
 
diff --git a/debian/patches/0001-disable-testsuite.patch b/debian/patches/0001-disable-testsuite.patch
index b4b3772..9015e7b 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
-@@ -807,7 +807,7 @@
+@@ -833,7 +833,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 00ccaae..70f8aee 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
-@@ -3057,4 +3057,36 @@
+@@ -3069,4 +3069,36 @@
  
      public void decachePreparedStatement(ServerPreparedStatement pstmt) throws SQLException {
      }
@@ -76,7 +76,7 @@ Subject: [PATCH] Java 8 compatibility
  }
 --- a/src/com/mysql/jdbc/CallableStatement.java
 +++ b/src/com/mysql/jdbc/CallableStatement.java
-@@ -2381,6 +2381,90 @@
+@@ -2383,6 +2383,90 @@
          }
      }
  
@@ -169,7 +169,7 @@ Subject: [PATCH] Java 8 compatibility
       */
 --- a/src/com/mysql/jdbc/ConnectionImpl.java
 +++ b/src/com/mysql/jdbc/ConnectionImpl.java
-@@ -5587,4 +5587,56 @@
+@@ -5550,4 +5550,56 @@
      public void setProfilerEventHandlerInstance(ProfilerEventHandler h) {
          this.eventSink = h;
      }
@@ -228,7 +228,7 @@ Subject: [PATCH] Java 8 compatibility
  }
 --- a/src/com/mysql/jdbc/DatabaseMetaData.java
 +++ b/src/com/mysql/jdbc/DatabaseMetaData.java
-@@ -7865,6 +7865,22 @@
+@@ -7892,6 +7892,22 @@
          return pStmt;
      }
  
@@ -253,7 +253,7 @@ Subject: [PATCH] Java 8 compatibility
       * 
 --- a/src/com/mysql/jdbc/MultiHostMySQLConnection.java
 +++ b/src/com/mysql/jdbc/MultiHostMySQLConnection.java
-@@ -2467,4 +2467,56 @@
+@@ -2482,4 +2482,56 @@
      public boolean isUseSSLExplicit() {
          return getActiveMySQLConnection().isUseSSLExplicit();
      }
@@ -312,7 +312,7 @@ Subject: [PATCH] Java 8 compatibility
  }
 --- a/src/com/mysql/jdbc/NonRegisteringDriver.java
 +++ b/src/com/mysql/jdbc/NonRegisteringDriver.java
-@@ -900,4 +900,9 @@
+@@ -906,4 +906,9 @@
              }
          }
      }
@@ -324,7 +324,7 @@ Subject: [PATCH] Java 8 compatibility
  }
 --- a/src/com/mysql/jdbc/PreparedStatement.java
 +++ b/src/com/mysql/jdbc/PreparedStatement.java
-@@ -5086,6 +5086,18 @@
+@@ -5090,6 +5090,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
-@@ -7923,4 +7923,200 @@
+@@ -7918,4 +7918,200 @@
      protected ExceptionInterceptor getExceptionInterceptor() {
          return this.exceptionInterceptor;
      }
@@ -548,7 +548,7 @@ Subject: [PATCH] Java 8 compatibility
  }
 --- a/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java
 +++ b/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java
-@@ -1512,6 +1512,142 @@
+@@ -1498,6 +1498,142 @@
  
          return null;
      }
@@ -693,7 +693,7 @@ Subject: [PATCH] Java 8 compatibility
      //		try {
 --- a/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java
 +++ b/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java
-@@ -2872,4 +2872,56 @@
+@@ -2885,4 +2885,56 @@
      public boolean isUseSSLExplicit() {
          return this.mc.isUseSSLExplicit();
      }
@@ -797,7 +797,7 @@ Subject: [PATCH] Java 8 compatibility
 \ No newline at end of file
 --- a/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java
 +++ b/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java
-@@ -748,6 +748,78 @@
+@@ -567,6 +567,78 @@
          return buf.toString();
      }
  
@@ -878,7 +878,7 @@ Subject: [PATCH] Java 8 compatibility
      //			throws SQLException {
 --- a/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java
 +++ b/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java
-@@ -769,6 +769,34 @@
+@@ -581,6 +581,34 @@
          }
      }
  
diff --git a/debian/patches/0003-disable-hibernate-fabric.patch b/debian/patches/0003-disable-hibernate-fabric.patch
index 30270f2..130355b 100644
--- a/debian/patches/0003-disable-hibernate-fabric.patch
+++ b/debian/patches/0003-disable-hibernate-fabric.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/build.xml
 +++ b/build.xml
-@@ -219,6 +219,7 @@
+@@ -244,6 +244,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>
-@@ -226,6 +227,7 @@
+@@ -251,6 +252,7 @@
                  </not>
              </condition>
          </fail>
@@ -19,7 +19,7 @@ Forwarded: not-needed
      </target>
  
  
-@@ -860,8 +862,10 @@
+@@ -887,8 +889,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 71db8ff..aecd756 100644
--- a/debian/patches/0004-skip-jdk-check.patch
+++ b/debian/patches/0004-skip-jdk-check.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/build.xml
 +++ b/build.xml
-@@ -390,7 +390,7 @@
+@@ -415,7 +415,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

More information about the pkg-java-commits mailing list