Author: ebourg-guest Date: 2013-11-06 23:05:28 +0000 (Wed, 06 Nov 2013) New Revision: 17444
Modified: trunk/mysql-connector-java/debian/changelog trunk/mysql-connector-java/debian/compat trunk/mysql-connector-java/debian/control trunk/mysql-connector-java/debian/orig-tar.sh trunk/mysql-connector-java/debian/patches/0001-disable-testsuite.patch trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch Log: New upstream release (5.1.27) Refreshed the patches Updated Standards-Version to 3.9.5 (no changes) Use XZ compression for the upstream tarball Switch to debhelper level 9 Modified: trunk/mysql-connector-java/debian/changelog =================================================================== --- trunk/mysql-connector-java/debian/changelog 2013-11-06 20:18:47 UTC (rev 17443) +++ trunk/mysql-connector-java/debian/changelog 2013-11-06 23:05:28 UTC (rev 17444) @@ -1,3 +1,13 @@ +mysql-connector-java (5.1.27-1) unstable; urgency=low + + * New upstream release + * Refreshed the patches + * Updated Standards-Version to 3.9.5 (no changes) + * Use XZ compression for the upstream tarball + * Switch to debhelper level 9 + + -- Emmanuel Bourg <[email protected]> Wed, 06 Nov 2013 23:49:02 +0100 + mysql-connector-java (5.1.26-1) unstable; urgency=low * New upstream release Modified: trunk/mysql-connector-java/debian/compat =================================================================== --- trunk/mysql-connector-java/debian/compat 2013-11-06 20:18:47 UTC (rev 17443) +++ trunk/mysql-connector-java/debian/compat 2013-11-06 23:05:28 UTC (rev 17444) @@ -1 +1 @@ -7 +9 Modified: trunk/mysql-connector-java/debian/control =================================================================== --- trunk/mysql-connector-java/debian/control 2013-11-06 20:18:47 UTC (rev 17443) +++ trunk/mysql-connector-java/debian/control 2013-11-06 23:05:28 UTC (rev 17444) @@ -3,13 +3,13 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Marcus Better <[email protected]>, Emmanuel Bourg <[email protected]> -Build-Depends: debhelper (>= 7), cdbs, ant, ant-optional +Build-Depends: debhelper (>= 9), cdbs, ant, ant-optional Build-Depends-Indep: default-jdk, junit, ant-contrib, maven-repo-helper, libslf4j-java -Standards-Version: 3.9.4 -Homepage: http://www.mysql.com/products/connector/j/ +Standards-Version: 3.9.5 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/mysql-connector-java Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/mysql-connector-java/ +Homepage: http://www.mysql.com/products/connector/j/ Package: libmysql-java Architecture: all Modified: trunk/mysql-connector-java/debian/orig-tar.sh =================================================================== --- trunk/mysql-connector-java/debian/orig-tar.sh 2013-11-06 20:18:47 UTC (rev 17443) +++ trunk/mysql-connector-java/debian/orig-tar.sh 2013-11-06 23:05:28 UTC (rev 17444) @@ -1,12 +1,14 @@ #!/bin/sh -e # called by uscan with '--upstream-version' <version> <file> -DIR=mysql-connector-java-$2.orig +VERSION=$2 +DIR=mysql-connector-java-$VERSION.orig # clean up the upstream tarball tar zxf $3 -mv mysql-connector-java-$2 $DIR -GZIP=--best tar czf $3 -X debian/orig-tar.exclude $DIR +rm $3 +mv mysql-connector-java-$VERSION $DIR +XZ_OPT=--best tar cJf ../mysql-connector-java_$VERSION.orig.tar.xz -X debian/orig-tar.exclude $DIR rm -rf $DIR # move to directory 'tarballs' Modified: trunk/mysql-connector-java/debian/patches/0001-disable-testsuite.patch =================================================================== --- trunk/mysql-connector-java/debian/patches/0001-disable-testsuite.patch 2013-11-06 20:18:47 UTC (rev 17443) +++ trunk/mysql-connector-java/debian/patches/0001-disable-testsuite.patch 2013-11-06 23:05:28 UTC (rev 17444) @@ -8,7 +8,7 @@ --- a/build.xml +++ b/build.xml -@@ -779,7 +779,7 @@ +@@ -796,7 +796,7 @@ </target> Modified: trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch =================================================================== --- trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch 2013-11-06 20:18:47 UTC (rev 17443) +++ trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch 2013-11-06 23:05:28 UTC (rev 17444) @@ -96,7 +96,7 @@ } --- a/src/com/mysql/jdbc/ConnectionImpl.java +++ b/src/com/mysql/jdbc/ConnectionImpl.java -@@ -6107,4 +6107,56 @@ +@@ -6114,4 +6114,56 @@ return getSocketTimeout(); } } @@ -155,7 +155,7 @@ } --- a/src/com/mysql/jdbc/DatabaseMetaData.java +++ b/src/com/mysql/jdbc/DatabaseMetaData.java -@@ -8694,4 +8694,20 @@ +@@ -8854,4 +8854,20 @@ throws SQLException { return true; } @@ -241,9 +241,9 @@ } public void setParseInfoCacheFactory(String factoryClassname) { -@@ -2643,4 +2643,57 @@ - public String getConnectionAttributes() throws SQLException { - return getActiveMySQLConnection().getConnectionAttributes(); +@@ -2673,4 +2673,57 @@ + // nothing to do here. + } + + @@ -317,7 +317,7 @@ SQLError.SQL_STATE_ILLEGAL_ARGUMENT, this.exceptionInterceptor); --- a/src/com/mysql/jdbc/NonRegisteringDriver.java +++ b/src/com/mysql/jdbc/NonRegisteringDriver.java -@@ -966,4 +966,8 @@ +@@ -1004,4 +1004,8 @@ } } } @@ -328,7 +328,7 @@ } --- a/src/com/mysql/jdbc/PreparedStatement.java +++ b/src/com/mysql/jdbc/PreparedStatement.java -@@ -5759,4 +5759,16 @@ +@@ -5758,4 +5758,16 @@ statementStartPos, sql, "SELECT", "\"'`", "\"'`", false) == -1 && rewritableOdku; } @@ -347,7 +347,7 @@ } --- a/src/com/mysql/jdbc/ReplicationConnection.java +++ b/src/com/mysql/jdbc/ReplicationConnection.java -@@ -2707,4 +2707,56 @@ +@@ -2944,4 +2944,56 @@ public String getConnectionAttributes() throws SQLException { return getCurrentConnection().getConnectionAttributes(); } @@ -406,7 +406,7 @@ } --- a/src/com/mysql/jdbc/ResultSetImpl.java +++ b/src/com/mysql/jdbc/ResultSetImpl.java -@@ -8747,4 +8747,204 @@ +@@ -8743,4 +8743,204 @@ protected ExceptionInterceptor getExceptionInterceptor() { return this.exceptionInterceptor; } @@ -787,8 +787,8 @@ } --- a/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java +++ b/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java -@@ -2842,7 +2842,59 @@ - return this.mc.getConnectionMutex(); +@@ -2859,7 +2859,59 @@ + } - public String getConnectionAttributes() throws SQLException { _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
