[postgis-java] 02/03: Drop sqlexception.patch, not required for new libpgjava (postgresql-jdbc).

Bas Couwenberg sebastic at debian.org
Wed Jan 11 21:04:34 UTC 2017


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository postgis-java.

commit 22dc09e0ac89f4a0278d7b2606dbe3d5ff6674eb
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jan 11 21:43:32 2017 +0100

    Drop sqlexception.patch, not required for new libpgjava (postgresql-jdbc).
---
 debian/changelog                  |  1 +
 debian/patches/series             |  1 -
 debian/patches/sqlexception.patch | 23 -----------------------
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 59df928..c03d922 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ postgis-java (1:2.2.1-3) UNRELEASED; urgency=medium
 
   * Update maven.rules for new libpgjava.
     (closes: #851019)
+  * Drop sqlexception.patch, not required for new libpgjava (postgresql-jdbc).
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 11 Jan 2017 21:36:34 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 6d1b2ca..9bcf1f7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 add-classpath.patch
 upstream-version.patch
-sqlexception.patch
diff --git a/debian/patches/sqlexception.patch b/debian/patches/sqlexception.patch
deleted file mode 100644
index 76675b7..0000000
--- a/debian/patches/sqlexception.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Declare SQLException to fix build failure.
- .
- [ERROR] /<path>/jdbc/src/main/java/org/postgis/DriverWrapper.java:[189,32]
- unreported exception java.sql.SQLException; must be caught or declared to be thrown
- .
- Reverts: https://github.com/postgis/postgis-java/commit/1c3f9362488c0d8a195802a00e62725f3830797c
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: not-needed
-
---- a/jdbc/src/main/java/org/postgis/DriverWrapper.java
-+++ b/jdbc/src/main/java/org/postgis/DriverWrapper.java
-@@ -179,8 +179,10 @@ public class DriverWrapper extends Drive
-      * @see java.sql.Driver#acceptsURL
-      * @param url the URL of the driver
-      * @return true if this driver accepts the given URL
-+     * @exception SQLException Passed through from the underlying PostgreSQL
-+     *                driver, should not happen.
-      */
--    public boolean acceptsURL(String url) {
-+    public boolean acceptsURL(String url) throws SQLException {
-         try {
-             url = mangleURL(url);
-         } catch (SQLException e) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis-java.git



More information about the Pkg-grass-devel mailing list