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

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-05-11 21:49:49 +0000 (Sat, 11 May 2013)
New Revision: 16615

Modified:
   trunk/mysql-connector-java/debian/changelog
   trunk/mysql-connector-java/debian/control
   trunk/mysql-connector-java/debian/patches/0001-disable-testsuite.patch
   trunk/mysql-connector-java/debian/patches/0002-java7-compat.patch
   trunk/mysql-connector-java/debian/rules
Log:
New upstream release (5.1.25)
Refreshed the patches
Updated Standards-Version to 3.9.4 (no changes)
debian/rules: Improved the clean target to allow rebuilds


Modified: trunk/mysql-connector-java/debian/changelog
===================================================================
--- trunk/mysql-connector-java/debian/changelog	2013-05-10 14:51:28 UTC (rev 16614)
+++ trunk/mysql-connector-java/debian/changelog	2013-05-11 21:49:49 UTC (rev 16615)
@@ -1,12 +1,17 @@
-mysql-connector-java (5.1.16-3) UNRELEASED; urgency=low
+mysql-connector-java (5.1.25-1) unstable; urgency=low
 
   * Team upload.
-  * Fix FTBFS with OpenJDK 7.
-  * Bump Standards-Version to 3.9.3. No changes were required.
+  * New upstream release
+  * Refreshed the patches
+  * Updated Standards-Version to 3.9.4 (no changes)
+  * debian/rules: Improved the clean target to allow rebuilds
+
+  [ Miguel Landaeta ] 
+  * Fix FTBFS with OpenJDK 7 (Closes: #706668)
   * 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
+ -- Emmanuel Bourg <ebourg at apache.org>  Sat, 11 May 2013 23:44:09 +0200
 
 mysql-connector-java (5.1.16-2) unstable; urgency=low
 

Modified: trunk/mysql-connector-java/debian/control
===================================================================
--- trunk/mysql-connector-java/debian/control	2013-05-10 14:51:28 UTC (rev 16614)
+++ trunk/mysql-connector-java/debian/control	2013-05-11 21:49:49 UTC (rev 16615)
@@ -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>
+Uploaders: Marcus Better <marcus at better.se>, Emmanuel Bourg <ebourg at apache.org>
 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.3
+Standards-Version: 3.9.4
 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/

Modified: trunk/mysql-connector-java/debian/patches/0001-disable-testsuite.patch
===================================================================
--- trunk/mysql-connector-java/debian/patches/0001-disable-testsuite.patch	2013-05-10 14:51:28 UTC (rev 16614)
+++ trunk/mysql-connector-java/debian/patches/0001-disable-testsuite.patch	2013-05-11 21:49:49 UTC (rev 16615)
@@ -6,11 +6,9 @@
  build.xml |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
-diff --git a/build.xml b/build.xml
-index 6ab7c02..2a65115 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -736,7 +736,7 @@ and the full path to the rt.jar from Java-6 with the property "com.mysql.jd
+@@ -779,7 +779,7 @@
  	</target>
  
  
@@ -19,4 +17,3 @@
  	</target>
  
  	<!-- Compiles the driver itself -->
--- 

Modified: trunk/mysql-connector-java/debian/patches/0002-java7-compat.patch
===================================================================
--- trunk/mysql-connector-java/debian/patches/0002-java7-compat.patch	2013-05-10 14:51:28 UTC (rev 16614)
+++ trunk/mysql-connector-java/debian/patches/0002-java7-compat.patch	2013-05-11 21:49:49 UTC (rev 16615)
@@ -3,13 +3,12 @@
 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();
- 	
+--- a/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java
++++ b/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java
+@@ -135,4 +135,23 @@
  	}
-+
+ 	
+ 	
 +	public void setSchema(String schema) throws SQLException {
 +		throw new UnsupportedOperationException("setSchema");
 +	}

Modified: trunk/mysql-connector-java/debian/rules
===================================================================
--- trunk/mysql-connector-java/debian/rules	2013-05-10 14:51:28 UTC (rev 16614)
+++ trunk/mysql-connector-java/debian/rules	2013-05-11 21:49:49 UTC (rev 16615)
@@ -24,6 +24,7 @@
 clean::
 	rm -rf dist
 	rm -f build-stamp
+	mh_clean
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename