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

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Sun Oct 30 21:27:18 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 397421dac52e6d6ce9985d938da5492c6a3374b3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Oct 30 22:13:29 2016 +0100

    Refreshed the patches
---
 debian/changelog                                   | 4 +++-
 debian/patches/0002-java6-compilation-compat.patch | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 63544ce..3bbb55a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-mysql-connector-java (5.1.39-2) UNRELEASED; urgency=medium
+mysql-connector-java (5.1.40-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Switch to debhelper level 10
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sun, 30 Oct 2016 22:10:05 +0100
diff --git a/debian/patches/0002-java6-compilation-compat.patch b/debian/patches/0002-java6-compilation-compat.patch
index 70f8aee..e445743 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
-@@ -3069,4 +3069,36 @@
+@@ -3050,4 +3050,36 @@
  
      public void decachePreparedStatement(ServerPreparedStatement pstmt) throws SQLException {
      }
@@ -228,7 +228,7 @@ Subject: [PATCH] Java 8 compatibility
  }
 --- a/src/com/mysql/jdbc/DatabaseMetaData.java
 +++ b/src/com/mysql/jdbc/DatabaseMetaData.java
-@@ -7892,6 +7892,22 @@
+@@ -7880,6 +7880,22 @@
          return pStmt;
      }
  
@@ -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
-@@ -7918,4 +7918,200 @@
+@@ -7906,4 +7906,200 @@
      protected ExceptionInterceptor getExceptionInterceptor() {
          return this.exceptionInterceptor;
      }
@@ -752,7 +752,7 @@ Subject: [PATCH] Java 8 compatibility
  }
 --- a/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
 +++ b/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
-@@ -429,4 +429,16 @@
+@@ -435,4 +435,16 @@
      //	public <T> T unwrap(Class<T> iface) throws SQLException {
      //		throw SQLError.createSQLFeatureNotSupportedException();
      //	}

-- 
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