Author: ebourg-guest Date: 2013-07-03 10:05:29 +0000 (Wed, 03 Jul 2013) New Revision: 16970
Added: trunk/mysql-connector-java/debian/README.source trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch Removed: trunk/mysql-connector-java/debian/README.Debian trunk/mysql-connector-java/debian/README.Debian-source trunk/mysql-connector-java/debian/patches/0002-java7-compat.patch Modified: trunk/mysql-connector-java/debian/changelog trunk/mysql-connector-java/debian/control trunk/mysql-connector-java/debian/patches/series trunk/mysql-connector-java/debian/rules trunk/mysql-connector-java/debian/watch Log: Added a patch to build with one JDK and removed the build dependency on java-gcj-compat-dev Use canonical URLs for the Vcs-* fields Updated the watch file Renamed debian/README.Debian-source to README.source Deleted: trunk/mysql-connector-java/debian/README.Debian =================================================================== --- trunk/mysql-connector-java/debian/README.Debian 2013-07-03 05:26:47 UTC (rev 16969) +++ trunk/mysql-connector-java/debian/README.Debian 2013-07-03 10:05:29 UTC (rev 16970) @@ -1,7 +0,0 @@ -MySQL Connector/J for Debian ----------------------------- - -In this version the JDBC 4 support is disabled because we have no runtime -in main currently that can compile it. - - -- Michael Koch <[email protected]> Fri, 30 Nov 2007 10:34:13 +0100 Deleted: trunk/mysql-connector-java/debian/README.Debian-source =================================================================== --- trunk/mysql-connector-java/debian/README.Debian-source 2013-07-03 05:26:47 UTC (rev 16969) +++ trunk/mysql-connector-java/debian/README.Debian-source 2013-07-03 10:05:29 UTC (rev 16970) @@ -1,11 +0,0 @@ -MySQL Connector/J for Debian ----------------------------- - -The upstream sources were modified to comply with the Debian Free -Software Guidelines. The following changes were made: - - * The third-party jars in `src/lib' were removed. - * The two pre-compiled JDBC driver jars (debug and release version) - were removed. - - -- Marcus Better <[email protected]> Fri, 22 Dec 2006 10:45:42 +0100 Copied: trunk/mysql-connector-java/debian/README.source (from rev 16957, trunk/mysql-connector-java/debian/README.Debian-source) =================================================================== --- trunk/mysql-connector-java/debian/README.source (rev 0) +++ trunk/mysql-connector-java/debian/README.source 2013-07-03 10:05:29 UTC (rev 16970) @@ -0,0 +1,11 @@ +MySQL Connector/J for Debian +---------------------------- + +The upstream sources were modified to comply with the Debian Free +Software Guidelines. The following changes were made: + + * The third-party jars in `src/lib' were removed. + * The two pre-compiled JDBC driver jars (debug and release version) + were removed. + + -- Marcus Better <[email protected]> Fri, 22 Dec 2006 10:45:42 +0100 Modified: trunk/mysql-connector-java/debian/changelog =================================================================== --- trunk/mysql-connector-java/debian/changelog 2013-07-03 05:26:47 UTC (rev 16969) +++ trunk/mysql-connector-java/debian/changelog 2013-07-03 10:05:29 UTC (rev 16970) @@ -1,17 +1,21 @@ mysql-connector-java (5.1.25-1) unstable; urgency=low - * Team upload. * New upstream release * Refreshed the patches + * Added a patch to build with one JDK and removed the build + dependency on java-gcj-compat-dev * Updated Standards-Version to 3.9.4 (no changes) + * Use canonical URLs for the Vcs-* fields * debian/rules: Improved the clean target to allow rebuilds + * Updated the watch file + * Renamed debian/README.Debian-source to README.source [ Miguel Landaeta ] * Fix FTBFS with OpenJDK 7 (Closes: #706668) * Remove Michael Koch from Uploaders list. Thanks for your work on this package. (Closes: #654122). - -- Emmanuel Bourg <[email protected]> Sat, 11 May 2013 23:44:09 +0200 + -- Emmanuel Bourg <[email protected]> Tue, 02 Jul 2013 17:07:51 +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-07-03 05:26:47 UTC (rev 16969) +++ trunk/mysql-connector-java/debian/control 2013-07-03 10:05:29 UTC (rev 16970) @@ -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, java-gcj-compat-dev, ant-optional +Build-Depends: debhelper (>= 7), 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/ -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/ +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/ Package: libmysql-java Architecture: all Added: trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch =================================================================== --- trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch (rev 0) +++ trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch 2013-07-03 10:05:29 UTC (rev 16970) @@ -0,0 +1,1196 @@ +Description: This patch adds dummy JDBC4 methods to enable the compilation + with Java 6 or 7 and no longer require Java 5 +Author: Emmanuel Bourg <[email protected]> +--- a/src/com/mysql/jdbc/CallableStatement.java ++++ b/src/com/mysql/jdbc/CallableStatement.java +@@ -426,11 +426,11 @@ + * @throws java.sql.SQLException If no object found that implements the interface + * @since 1.6 + */ +- public Object unwrap(Class<?> iface) throws java.sql.SQLException { ++ public <T> T unwrap(Class<T> iface) throws SQLException { + try { + // This works for classes that aren't actually wrapping + // anything +- return Util.cast(iface, this); ++ return iface.cast(this); + } catch (ClassCastException cce) { + throw SQLError.createSQLException("Unable to unwrap to " + iface.toString(), + SQLError.SQL_STATE_ILLEGAL_ARGUMENT, getExceptionInterceptor()); +@@ -2670,4 +2670,76 @@ + } + } + } ++ ++ public java.sql.RowId getRowId(int parameterIndex) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.RowId getRowId(String parameterName) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setRowId(String parameterName, java.sql.RowId x) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setNString(String parameterName, String value) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setNClob(String parameterName, java.sql.NClob value) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setNClob(String parameterName, Reader reader, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.NClob getNClob(int parameterIndex) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.NClob getNClob(String parameterName) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setSQLXML(String parameterName, java.sql.SQLXML xmlObject) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.SQLXML getSQLXML(int parameterIndex) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.SQLXML getSQLXML(String parameterName) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public String getNString(int parameterIndex) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public String getNString(String parameterName) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public Reader getNCharacterStream(int parameterIndex) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public Reader getNCharacterStream(String parameterName) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public Reader getCharacterStream(int parameterIndex) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public Reader getCharacterStream(String parameterName) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setNClob(String parameterName, Reader reader) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } + } +--- a/src/com/mysql/jdbc/ConnectionImpl.java ++++ b/src/com/mysql/jdbc/ConnectionImpl.java +@@ -6101,4 +6101,56 @@ + return getSocketTimeout(); + } + } ++ ++ public java.sql.Clob createClob() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.Blob createBlob() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.NClob createNClob() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.SQLXML createSQLXML() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public boolean isValid(int timeout) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setClientInfo(String name, String value) throws java.sql.SQLClientInfoException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setClientInfo(Properties properties) throws java.sql.SQLClientInfoException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public String getClientInfo(String name) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public Properties getClientInfo() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.Struct createStruct(String typeName, Object[] attributes) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public <T> T unwrap(Class<T> iface) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public boolean isWrapperFor(Class<?> iface) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } + } +--- a/src/com/mysql/jdbc/DatabaseMetaData.java ++++ b/src/com/mysql/jdbc/DatabaseMetaData.java +@@ -8540,4 +8540,28 @@ + throws SQLException { + return true; + } ++ ++ public java.sql.RowIdLifetime getRowIdLifetime() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public boolean autoCommitFailureClosesAllResultSets() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public ResultSet getClientInfoProperties() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public ResultSet getFunctions(String catalog, String schemaPattern, String functionNamePattern) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public <T> T unwrap(Class<T> iface) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public boolean isWrapperFor(Class<?> iface) throws SQLException { ++ throw new SQLException(); ++ } + } +--- a/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java ++++ b/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java +@@ -2553,34 +2553,34 @@ + getActiveMySQLConnection().setIncludeThreadNamesAsStatementComment(flag); + } + +- public boolean isServerLocal() throws SQLException { +- return getActiveMySQLConnection().isServerLocal(); +- } +- +- public void setAuthenticationPlugins(String authenticationPlugins) { +- getActiveMySQLConnection().setAuthenticationPlugins(authenticationPlugins); +- } +- +- public String getAuthenticationPlugins() { +- return getActiveMySQLConnection().getAuthenticationPlugins(); +- } +- +- public void setDisabledAuthenticationPlugins( +- String disabledAuthenticationPlugins) { +- getActiveMySQLConnection().setDisabledAuthenticationPlugins(disabledAuthenticationPlugins); +- } +- +- public String getDisabledAuthenticationPlugins() { +- return getActiveMySQLConnection().getDisabledAuthenticationPlugins(); +- } +- +- public void setDefaultAuthenticationPlugin( +- String defaultAuthenticationPlugin) { +- getActiveMySQLConnection().setDefaultAuthenticationPlugin(defaultAuthenticationPlugin); +- } +- +- public String getDefaultAuthenticationPlugin() { +- return getActiveMySQLConnection().getDefaultAuthenticationPlugin(); ++ public boolean isServerLocal() throws SQLException { ++ return getActiveMySQLConnection().isServerLocal(); ++ } ++ ++ public void setAuthenticationPlugins(String authenticationPlugins) { ++ getActiveMySQLConnection().setAuthenticationPlugins(authenticationPlugins); ++ } ++ ++ public String getAuthenticationPlugins() { ++ return getActiveMySQLConnection().getAuthenticationPlugins(); ++ } ++ ++ public void setDisabledAuthenticationPlugins( ++ String disabledAuthenticationPlugins) { ++ getActiveMySQLConnection().setDisabledAuthenticationPlugins(disabledAuthenticationPlugins); ++ } ++ ++ public String getDisabledAuthenticationPlugins() { ++ return getActiveMySQLConnection().getDisabledAuthenticationPlugins(); ++ } ++ ++ public void setDefaultAuthenticationPlugin( ++ String defaultAuthenticationPlugin) { ++ getActiveMySQLConnection().setDefaultAuthenticationPlugin(defaultAuthenticationPlugin); ++ } ++ ++ public String getDefaultAuthenticationPlugin() { ++ return getActiveMySQLConnection().getDefaultAuthenticationPlugin(); + } + + public void setParseInfoCacheFactory(String factoryClassname) { +@@ -2635,4 +2635,57 @@ + public String getConnectionAttributes() throws SQLException { + return getActiveMySQLConnection().getConnectionAttributes(); + } ++ ++ ++ public java.sql.Clob createClob() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.Blob createBlob() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.NClob createNClob() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.SQLXML createSQLXML() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public boolean isValid(int timeout) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setClientInfo(String name, String value) throws java.sql.SQLClientInfoException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setClientInfo(Properties properties) throws java.sql.SQLClientInfoException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public String getClientInfo(String name) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public Properties getClientInfo() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.Struct createStruct(String typeName, Object[] attributes) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public <T> T unwrap(Class<T> iface) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public boolean isWrapperFor(Class<?> iface) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } + } +--- a/src/com/mysql/jdbc/MysqlParameterMetadata.java ++++ b/src/com/mysql/jdbc/MysqlParameterMetadata.java +@@ -202,11 +202,11 @@ + * @throws java.sql.SQLException If no object found that implements the interface + * @since 1.6 + */ +- public Object unwrap(Class<?> iface) throws java.sql.SQLException { ++ public <T> T unwrap(Class<T> iface) throws SQLException { + try { + // This works for classes that aren't actually wrapping + // anything +- return Util.cast(iface, this); ++ return iface.cast(this); + } catch (ClassCastException cce) { + throw SQLError.createSQLException("Unable to unwrap to " + iface.toString(), + 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 @@ + } + } + } ++ ++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } + } +--- a/src/com/mysql/jdbc/PreparedStatement.java ++++ b/src/com/mysql/jdbc/PreparedStatement.java +@@ -5757,4 +5757,16 @@ + statementStartPos, sql, "SELECT", "\"'`", + "\"'`", false) == -1 && rewritableOdku; + } ++ ++ public void setRowId(int parameterIndex, java.sql.RowId x) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setNClob(int parameterIndex, java.sql.NClob value) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setSQLXML(int parameterIndex, java.sql.SQLXML xmlObject) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } + } +--- a/src/com/mysql/jdbc/ReplicationConnection.java ++++ b/src/com/mysql/jdbc/ReplicationConnection.java +@@ -2695,4 +2695,56 @@ + public Object getConnectionMutex() { + return getCurrentConnection().getConnectionMutex(); + } ++ ++ public Clob createClob() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public Blob createBlob() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.NClob createNClob() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.SQLXML createSQLXML() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public boolean isValid(int timeout) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setClientInfo(String name, String value) throws java.sql.SQLClientInfoException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setClientInfo(Properties properties) throws java.sql.SQLClientInfoException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public String getClientInfo(String name) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public Properties getClientInfo() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.Struct createStruct(String typeName, Object[] attributes) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public <T> T unwrap(Class<T> iface) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public boolean isWrapperFor(Class<?> iface) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } + } +--- a/src/com/mysql/jdbc/ResultSetImpl.java ++++ b/src/com/mysql/jdbc/ResultSetImpl.java +@@ -8747,4 +8747,204 @@ + protected ExceptionInterceptor getExceptionInterceptor() { + return this.exceptionInterceptor; + } ++ ++ public java.sql.RowId getRowId(int columnIndex) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.RowId getRowId(String columnLabel) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateRowId(int columnIndex, java.sql.RowId x) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateRowId(String columnLabel, java.sql.RowId x) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public int getHoldability() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public boolean isClosed() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateNString(int columnIndex, String nString) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateNString(String columnLabel, String nString) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateNClob(int columnIndex, java.sql.NClob nClob) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateNClob(String columnLabel, java.sql.NClob nClob) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.NClob getNClob(int columnIndex) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.NClob getNClob(String columnLabel) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.SQLXML getSQLXML(int columnIndex) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.SQLXML getSQLXML(String columnLabel) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateSQLXML(int columnIndex, java.sql.SQLXML xmlObject) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateSQLXML(String columnLabel, java.sql.SQLXML xmlObject) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public String getNString(int columnIndex) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public String getNString(String columnLabel) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.io.Reader getNCharacterStream(int columnIndex) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.io.Reader getNCharacterStream(String columnLabel) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateNCharacterStream(int columnIndex, java.io.Reader x, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateNCharacterStream(String columnLabel, java.io.Reader reader, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateCharacterStream(int columnIndex, java.io.Reader x, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateCharacterStream(String columnLabel, java.io.Reader reader, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateClob(int columnIndex, java.io.Reader reader, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateClob(String columnLabel, java.io.Reader reader, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateNClob(int columnIndex, java.io.Reader reader, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateNClob(String columnLabel, java.io.Reader reader, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateNCharacterStream(int columnIndex, java.io.Reader x) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateNCharacterStream(String columnLabel, java.io.Reader reader) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateCharacterStream(int columnIndex, java.io.Reader x) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateCharacterStream(String columnLabel, java.io.Reader reader) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateClob(int columnIndex, java.io.Reader reader) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateClob(String columnLabel, java.io.Reader reader) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateNClob(int columnIndex, java.io.Reader reader) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void updateNClob(String columnLabel, java.io.Reader reader) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public <T> T unwrap(Class<T> iface) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public boolean isWrapperFor(Class<?> iface) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } + } +--- a/src/com/mysql/jdbc/ResultSetMetaData.java ++++ b/src/com/mysql/jdbc/ResultSetMetaData.java +@@ -849,11 +849,11 @@ + * @throws java.sql.SQLException If no object found that implements the interface + * @since 1.6 + */ +- public Object unwrap(Class<?> iface) throws java.sql.SQLException { ++ public <T> T unwrap(Class<T> iface) throws SQLException { + try { + // This works for classes that aren't actually wrapping + // anything +- return Util.cast(iface, this); ++ return iface.cast(this); + } catch (ClassCastException cce) { + throw SQLError.createSQLException("Unable to unwrap to " + iface.toString(), + SQLError.SQL_STATE_ILLEGAL_ARGUMENT, this.exceptionInterceptor); +--- a/src/com/mysql/jdbc/StatementImpl.java ++++ b/src/com/mysql/jdbc/StatementImpl.java +@@ -2971,11 +2971,11 @@ + * @throws java.sql.SQLException If no object found that implements the interface + * @since 1.6 + */ +- public Object unwrap(Class<?> iface) throws java.sql.SQLException { ++ public <T> T unwrap(Class<T> iface) throws SQLException { + try { + // This works for classes that aren't actually wrapping + // anything +- return Util.cast(iface, this); ++ return iface.cast(this); + } catch (ClassCastException cce) { + throw SQLError.createSQLException("Unable to unwrap to " + iface.toString(), + SQLError.SQL_STATE_ILLEGAL_ARGUMENT, getExceptionInterceptor()); +--- a/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java ++++ b/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java +@@ -2636,4 +2636,139 @@ + // throw SQLError.notImplemented(); + // } + ++ public java.sql.RowId getRowId(int parameterIndex) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.RowId getRowId(String parameterName) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setRowId(String parameterName, java.sql.RowId x) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setNString(String parameterName, String value) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setNCharacterStream(String parameterName, Reader value, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setNClob(String parameterName, java.sql.NClob value) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setClob(String parameterName, Reader reader, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setBlob(String parameterName, InputStream inputStream, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setNClob(String parameterName, Reader reader, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.NClob getNClob(int parameterIndex) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.NClob getNClob(String parameterName) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setSQLXML(String parameterName, java.sql.SQLXML xmlObject) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.SQLXML getSQLXML(int parameterIndex) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.SQLXML getSQLXML(String parameterName) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public String getNString(int parameterIndex) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public String getNString(String parameterName) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public Reader getNCharacterStream(int parameterIndex) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public Reader getNCharacterStream(String parameterName) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public Reader getCharacterStream(int parameterIndex) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public Reader getCharacterStream(String parameterName) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setBlob(String parameterName, Blob x) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setClob(String parameterName, Clob x) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setAsciiStream(String parameterName, InputStream x, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setBinaryStream(String parameterName, InputStream x, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setCharacterStream(String parameterName, Reader reader, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setAsciiStream(String parameterName, InputStream x) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setBinaryStream(String parameterName, InputStream x) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setCharacterStream(String parameterName, Reader reader) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setNCharacterStream(String parameterName, Reader value) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setClob(String parameterName, Reader reader) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setBlob(String parameterName, InputStream inputStream) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setNClob(String parameterName, Reader reader) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public <T> T getObject(int parameterIndex, Class<T> type) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public <T> T getObject(String parameterName, Class<T> type) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } + } +--- a/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java ++++ b/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java +@@ -2834,4 +2834,55 @@ + return this.mc.getConnectionMutex(); + } + ++ public java.sql.Clob createClob() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.Blob createBlob() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.NClob createNClob() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.SQLXML createSQLXML() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public boolean isValid(int timeout) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setClientInfo(String name, String value) throws java.sql.SQLClientInfoException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setClientInfo(Properties properties) throws java.sql.SQLClientInfoException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public String getClientInfo(String name) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public Properties getClientInfo() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.Struct createStruct(String typeName, Object[] attributes) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public <T> T unwrap(Class<T> iface) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public boolean isWrapperFor(Class<?> iface) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } + } +\ No newline at end of file +--- a/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java ++++ b/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java +@@ -450,4 +450,16 @@ + // public <T> T unwrap(Class<T> iface) throws SQLException { + // throw SQLError.notImplemented(); + // } ++ ++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } ++ ++ public <T> T unwrap(Class<T> iface) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public boolean isWrapperFor(Class<?> iface) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } + } +--- a/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java ++++ b/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java +@@ -254,4 +254,12 @@ + protected ExceptionInterceptor getExceptionInterceptor() { + return this.exceptionInterceptor; + } ++ ++ public void addStatementEventListener(javax.sql.StatementEventListener listener) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void removeStatementEventListener(javax.sql.StatementEventListener listener) { ++ throw new UnsupportedOperationException(); ++ } + } +\ No newline at end of file +--- a/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java ++++ b/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java +@@ -1224,4 +1224,76 @@ + // public Object unwrap(Class arg0) throws SQLException { + // throw SQLError.notImplemented(); + // } ++ ++ public void setRowId(int parameterIndex, java.sql.RowId x) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setNString(int parameterIndex, String value) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setNClob(int parameterIndex, java.sql.NClob value) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setClob(int parameterIndex, Reader reader, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setSQLXML(int parameterIndex, java.sql.SQLXML xmlObject) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setClob(int parameterIndex, Reader reader) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setNClob(int parameterIndex, Reader reader) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } + } +--- a/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java ++++ b/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java +@@ -866,4 +866,32 @@ + checkAndFireConnectionError(sqlEx); + } + } ++ ++ public boolean isClosed() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setPoolable(boolean poolable) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public boolean isPoolable() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void closeOnCompletion() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public boolean isCloseOnCompletion() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public <T> T unwrap(Class<T> iface) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public boolean isWrapperFor(Class<?> iface) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } + } +--- a/src/testsuite/regression/StatementRegressionTest.java ++++ b/src/testsuite/regression/StatementRegressionTest.java +@@ -2542,7 +2542,7 @@ + try { + pStmt = this.conn + .prepareStatement("INSERT INTO testNullClob VALUES (?)"); +- pStmt.setClob(1, null); ++ pStmt.setClob(1, (Clob) null); + pStmt.executeUpdate(); + } finally { + if (pStmt != null) { +@@ -5272,7 +5272,180 @@ + public int getBytesSize() throws SQLException { + return 0; + } +- }; ++ ++ public java.sql.RowId getRowId(int columnIndex) throws SQLException { ++ return null; ++ } ++ ++ public java.sql.RowId getRowId(String columnLabel) throws SQLException { ++ return null; ++ } ++ ++ public void updateRowId(int columnIndex, java.sql.RowId x) throws SQLException { ++ } ++ ++ public void updateRowId(String columnLabel, java.sql.RowId x) throws SQLException { ++ } ++ ++ public int getHoldability() throws SQLException { ++ return 0; ++ } ++ ++ public boolean isClosed() throws SQLException { ++ return false; ++ } ++ ++ public void updateNString(int columnIndex, String nString) throws SQLException { ++ } ++ ++ public void updateNString(String columnLabel, String nString) throws SQLException { ++ } ++ ++ public void updateNClob(int columnIndex, java.sql.NClob nClob) throws SQLException { ++ } ++ ++ public void updateNClob(String columnLabel, java.sql.NClob nClob) throws SQLException { ++ } ++ ++ public java.sql.NClob getNClob(int columnIndex) throws SQLException { ++ return null; ++ } ++ ++ public java.sql.NClob getNClob(String columnLabel) throws SQLException { ++ return null; ++ } ++ ++ public java.sql.SQLXML getSQLXML(int columnIndex) throws SQLException { ++ return null; ++ } ++ ++ public java.sql.SQLXML getSQLXML(String columnLabel) throws SQLException { ++ return null; ++ } ++ ++ public void updateSQLXML(int columnIndex, java.sql.SQLXML xmlObject) throws SQLException { ++ } ++ ++ public void updateSQLXML(String columnLabel, java.sql.SQLXML xmlObject) throws SQLException { ++ } ++ ++ public String getNString(int columnIndex) throws SQLException { ++ return null; ++ } ++ ++ public String getNString(String columnLabel) throws SQLException { ++ return null; ++ } ++ ++ public Reader getNCharacterStream(int columnIndex) throws SQLException { ++ return null; ++ } ++ ++ public Reader getNCharacterStream(String columnLabel) throws SQLException { ++ return null; ++ } ++ ++ public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException { ++ } ++ ++ public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { ++ } ++ ++ public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException { ++ } ++ ++ public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException { ++ } ++ ++ public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException { ++ } ++ ++ public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException { ++ } ++ ++ public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException { ++ } ++ ++ public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { ++ } ++ ++ public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException { ++ } ++ ++ public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException { ++ } ++ ++ public void updateClob(int columnIndex, Reader reader, long length) throws SQLException { ++ } ++ ++ public void updateClob(String columnLabel, Reader reader, long length) throws SQLException { ++ } ++ ++ public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException { ++ ++ } ++ ++ public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException { ++ } ++ ++ public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException { ++ } ++ ++ public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException { ++ } ++ ++ public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException { ++ } ++ ++ public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException { ++ } ++ ++ public void updateCharacterStream(int columnIndex, Reader x) throws SQLException { ++ } ++ ++ public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException { ++ } ++ ++ public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException { ++ } ++ ++ public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException { ++ } ++ ++ public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException { ++ } ++ ++ public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException { ++ } ++ ++ public void updateClob(int columnIndex, Reader reader) throws SQLException { ++ } ++ ++ public void updateClob(String columnLabel, Reader reader) throws SQLException { ++ } ++ ++ public void updateNClob(int columnIndex, Reader reader) throws SQLException { ++ } ++ ++ public void updateNClob(String columnLabel, Reader reader) throws SQLException { ++ } ++ ++ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException { ++ return null; ++ } ++ ++ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException { ++ return null; ++ } ++ ++ public <T> T unwrap(Class<T> iface) throws SQLException { ++ return null; ++ } ++ ++ public boolean isWrapperFor(Class<?> iface) throws SQLException { ++ return false; ++ } ++ }; + } + + /** Deleted: trunk/mysql-connector-java/debian/patches/0002-java7-compat.patch =================================================================== --- trunk/mysql-connector-java/debian/patches/0002-java7-compat.patch 2013-07-03 05:26:47 UTC (rev 16969) +++ trunk/mysql-connector-java/debian/patches/0002-java7-compat.patch 2013-07-03 10:05:29 UTC (rev 16970) @@ -1,31 +0,0 @@ -Description: Dummy compatibility patch with Java7 APIs -Author: Miguel Landaeta <[email protected]> -Forwarded: no -Last-Update: 2012-06-27 - ---- 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"); -+ } -+ -+ public String getSchema() throws SQLException { -+ throw new UnsupportedOperationException("getSchema"); -+ } -+ -+ public void abort(java.util.concurrent.Executor executor) throws SQLException { -+ throw new UnsupportedOperationException("abort"); -+ } -+ -+ public void setNetworkTimeout(java.util.concurrent.Executor executor, int milliseconds) throws SQLException { -+ throw new UnsupportedOperationException("setNetworkTimeout"); -+ } -+ -+ public int getNetworkTimeout() throws SQLException { -+ throw new UnsupportedOperationException("getNetworkTimeout"); -+ } - } Modified: trunk/mysql-connector-java/debian/patches/series =================================================================== --- trunk/mysql-connector-java/debian/patches/series 2013-07-03 05:26:47 UTC (rev 16969) +++ trunk/mysql-connector-java/debian/patches/series 2013-07-03 10:05:29 UTC (rev 16970) @@ -1,2 +1,2 @@ 0001-disable-testsuite.patch -0002-java7-compat.patch +0002-java6-compilation-compat.patch Modified: trunk/mysql-connector-java/debian/rules =================================================================== --- trunk/mysql-connector-java/debian/rules 2013-07-03 05:26:47 UTC (rev 16969) +++ trunk/mysql-connector-java/debian/rules 2013-07-03 10:05:29 UTC (rev 16970) @@ -5,14 +5,11 @@ VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/Version: //' | cut -f1 -d- | cut -f1 -d+) -JAVA_HOME := /usr/lib/jvm/java-gcj -#quick fix for #640619 -#JAVA6_HOME := /usr/lib/jvm/java-6-openjdk -JAVA6_HOME := /usr/lib/jvm/default-java +JAVA_HOME := /usr/lib/jvm/default-java DEB_JARS := ant ant-launcher ant-junit junit ant-contrib slf4j-api -DEB_ANT_ARGS := -Dcom.mysql.jdbc.java6.javac=$(JAVA6_HOME)/bin/javac \ - -Dcom.mysql.jdbc.java6.rtjar=$(JAVA6_HOME)/jre/lib/rt.jar \ +DEB_ANT_ARGS := -Dcom.mysql.jdbc.java6.javac=$(JAVA_HOME)/bin/javac \ + -Dcom.mysql.jdbc.java6.rtjar=$(JAVA_HOME)/jre/lib/rt.jar \ -Dsnapshot.version= binary-post-install/libmysql-java:: Modified: trunk/mysql-connector-java/debian/watch =================================================================== --- trunk/mysql-connector-java/debian/watch 2013-07-03 05:26:47 UTC (rev 16969) +++ trunk/mysql-connector-java/debian/watch 2013-07-03 10:05:29 UTC (rev 16970) @@ -1,2 +1,2 @@ version=3 -ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/Connector-J/mysql-connector-java-(.*)\.tar\.gz debian debian/orig-tar.sh +http://ftp.gwdg.de/pub/misc/mysql/Downloads/Connector-J/mysql-connector-java-(.*)\.tar\.gz debian debian/orig-tar.sh _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
