The following commit has been merged in the master branch:
commit 49bd33fec5cb63c7971c4e77baf3d8b8094f1085
Author: Emmanuel Bourg <[email protected]>
Date: Wed Jul 31 19:50:13 2013 +0200
Added a description to the patch
diff --git a/debian/patches/01-compatible-with-java7.diff
b/debian/patches/01-compatible-with-java7.diff
index 2110c00..dffb39e 100644
--- a/debian/patches/01-compatible-with-java7.diff
+++ b/debian/patches/01-compatible-with-java7.diff
@@ -1,7 +1,9 @@
-Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/ConnectionJDBC2.java
-===================================================================
----
libjtds-java-1.2.5+dfsg.orig/src/main/net/sourceforge/jtds/jdbc/ConnectionJDBC2.java
2009-12-30 23:45:52.000000000 +0800
-+++
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/ConnectionJDBC2.java
2013-07-21 11:13:09.845351377 +0800
+Description: Adds dummy JDBC 4.1 methods to compile with Java 7.
+ This patch can be removed after upgrading to jTDS 1.3
+Author: Shuxiong Ye <[email protected]>.
+Forwarded: not-needed
+--- a/src/main/net/sourceforge/jtds/jdbc/ConnectionJDBC2.java
++++ b/src/main/net/sourceforge/jtds/jdbc/ConnectionJDBC2.java
@@ -29,6 +29,7 @@
import java.util.Properties;
import java.util.HashSet;
@@ -39,10 +41,8 @@ Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/ConnectionJDBC
+
+}
+
-Index: libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/Driver.java
-===================================================================
----
libjtds-java-1.2.5+dfsg.orig/src/main/net/sourceforge/jtds/jdbc/Driver.java
2009-12-30 23:45:52.000000000 +0800
-+++ libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/Driver.java
2013-07-21 11:14:12.225660703 +0800
+--- a/src/main/net/sourceforge/jtds/jdbc/Driver.java
++++ b/src/main/net/sourceforge/jtds/jdbc/Driver.java
@@ -21,11 +21,13 @@
import java.sql.DriverManager;
import java.sql.DriverPropertyInfo;
@@ -67,10 +67,8 @@ Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/Driver.java
+ }
}
+
-Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/JtdsCallableStatement.java
-===================================================================
----
libjtds-java-1.2.5+dfsg.orig/src/main/net/sourceforge/jtds/jdbc/JtdsCallableStatement.java
2009-12-30 23:45:52.000000000 +0800
-+++
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/JtdsCallableStatement.java
2013-07-21 11:14:21.365706037 +0800
+--- a/src/main/net/sourceforge/jtds/jdbc/JtdsCallableStatement.java
++++ b/src/main/net/sourceforge/jtds/jdbc/JtdsCallableStatement.java
@@ -1075,4 +1075,15 @@
throw new AbstractMethodError();
}
@@ -89,10 +87,8 @@ Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/JtdsCallableSt
+
+}
+
-Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/JtdsDatabaseMetaData.java
-===================================================================
----
libjtds-java-1.2.5+dfsg.orig/src/main/net/sourceforge/jtds/jdbc/JtdsDatabaseMetaData.java
2009-12-30 23:45:52.000000000 +0800
-+++
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/JtdsDatabaseMetaData.java
2013-07-21 11:14:29.357745661 +0800
+--- a/src/main/net/sourceforge/jtds/jdbc/JtdsDatabaseMetaData.java
++++ b/src/main/net/sourceforge/jtds/jdbc/JtdsDatabaseMetaData.java
@@ -783,7 +783,7 @@
* @throws SQLException if a database-access error occurs.
*/
@@ -120,10 +116,8 @@ Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/JtdsDatabaseMe
+
+}
+
-Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/JtdsResultSet.java
-===================================================================
----
libjtds-java-1.2.5+dfsg.orig/src/main/net/sourceforge/jtds/jdbc/JtdsResultSet.java
2009-12-30 23:45:52.000000000 +0800
-+++
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/JtdsResultSet.java
2013-07-21 11:14:37.577786415 +0800
+--- a/src/main/net/sourceforge/jtds/jdbc/JtdsResultSet.java
++++ b/src/main/net/sourceforge/jtds/jdbc/JtdsResultSet.java
@@ -1766,4 +1766,14 @@
throw new AbstractMethodError();
}
@@ -141,10 +135,8 @@ Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/JtdsResultSet.
+
+}
+
-Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/JtdsStatement.java
-===================================================================
----
libjtds-java-1.2.5+dfsg.orig/src/main/net/sourceforge/jtds/jdbc/JtdsStatement.java
2009-12-30 23:45:52.000000000 +0800
-+++
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/JtdsStatement.java
2013-07-21 11:14:47.413835196 +0800
+--- a/src/main/net/sourceforge/jtds/jdbc/JtdsStatement.java
++++ b/src/main/net/sourceforge/jtds/jdbc/JtdsStatement.java
@@ -1346,4 +1346,13 @@
throw new AbstractMethodError();
}
@@ -161,10 +153,8 @@ Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/JtdsStatement.
+
+}
+
-Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbcx/JtdsDataSource.java
-===================================================================
----
libjtds-java-1.2.5+dfsg.orig/src/main/net/sourceforge/jtds/jdbcx/JtdsDataSource.java
2009-12-30 23:45:52.000000000 +0800
-+++
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbcx/JtdsDataSource.java
2013-07-21 11:14:56.501880259 +0800
+--- a/src/main/net/sourceforge/jtds/jdbcx/JtdsDataSource.java
++++ b/src/main/net/sourceforge/jtds/jdbcx/JtdsDataSource.java
@@ -20,6 +20,7 @@
import java.io.*;
import java.sql.Connection;
@@ -185,10 +175,8 @@ Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbcx/JtdsDataSourc
+ }
+}
+
-Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbcx/proxy/CallableStatementProxy.java
-===================================================================
----
libjtds-java-1.2.5+dfsg.orig/src/main/net/sourceforge/jtds/jdbcx/proxy/CallableStatementProxy.java
2009-12-30 23:45:52.000000000 +0800
-+++
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbcx/proxy/CallableStatementProxy.java
2013-07-21 11:15:03.861916761 +0800
+--- a/src/main/net/sourceforge/jtds/jdbcx/proxy/CallableStatementProxy.java
++++ b/src/main/net/sourceforge/jtds/jdbcx/proxy/CallableStatementProxy.java
@@ -22,6 +22,7 @@
import java.math.BigDecimal;
import java.sql.*;
@@ -215,10 +203,8 @@ Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbcx/proxy/Callabl
+
+}
+
-Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbcx/proxy/ConnectionProxy.java
-===================================================================
----
libjtds-java-1.2.5+dfsg.orig/src/main/net/sourceforge/jtds/jdbcx/proxy/ConnectionProxy.java
2009-12-30 23:45:52.000000000 +0800
-+++
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbcx/proxy/ConnectionProxy.java
2013-07-21 11:15:11.157952941 +0800
+--- a/src/main/net/sourceforge/jtds/jdbcx/proxy/ConnectionProxy.java
++++ b/src/main/net/sourceforge/jtds/jdbcx/proxy/ConnectionProxy.java
@@ -20,6 +20,7 @@
import java.sql.*;
import java.util.Map;
@@ -256,10 +242,8 @@ Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbcx/proxy/Connect
+
+}
+
-Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbcx/proxy/StatementProxy.java
-===================================================================
----
libjtds-java-1.2.5+dfsg.orig/src/main/net/sourceforge/jtds/jdbcx/proxy/StatementProxy.java
2009-12-30 23:45:52.000000000 +0800
-+++
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbcx/proxy/StatementProxy.java
2013-07-21 11:15:18.425988983 +0800
+--- a/src/main/net/sourceforge/jtds/jdbcx/proxy/StatementProxy.java
++++ b/src/main/net/sourceforge/jtds/jdbcx/proxy/StatementProxy.java
@@ -740,4 +740,13 @@
throw new AbstractMethodError();
}
--
libjtds-java: jTDS JDBC Driver for SQL Server and Sybase
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
