[Git][debian-gis-team/postgis-java][master] 3 commits: Add patch to fix FTBFS with libpostgresql-jdbc-java 42.2.2.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / postgis-java


Commits:
29b45cb2 by Bas Couwenberg at 2018-06-20T19:52:26+02:00
Add patch to fix FTBFS with libpostgresql-jdbc-java 42.2.2.

- - - - -
12bcc547 by Bas Couwenberg at 2018-06-20T20:08:45+02:00
Mark patches as Forwarded.

- - - - -
931384ee by Bas Couwenberg at 2018-06-20T20:08:59+02:00
Set distribution to unstable.

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/driverwrapper.patch
- debian/patches/series
- debian/patches/upstream-version.patch


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-postgis-java (1:2.2.1-7) UNRELEASED; urgency=medium
+postgis-java (1:2.2.1-7) unstable; urgency=medium
 
   * Update Vcs-* URLs for Salsa.
   * Drop override for vcs-deprecated-in-debian-infrastructure.
   * Bump Standards-Version to 4.1.4, no changes.
   * Drop obsolete get-orig-source target.
   * Strip trailing whitespace from changelog & rules files.
+  * Add patch to fix FTBFS with libpostgresql-jdbc-java 42.2.2.
 
- -- Bas Couwenberg <sebastic at debian.org>  Sat, 31 Mar 2018 12:45:52 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 20 Jun 2018 20:08:47 +0200
 
 postgis-java (1:2.2.1-6) unstable; urgency=medium
 


=====================================
debian/patches/driverwrapper.patch
=====================================
--- /dev/null
+++ b/debian/patches/driverwrapper.patch
@@ -0,0 +1,26 @@
+Description: libpostgresql-jdbc-java 42.2.2 doesn't thow exception any more.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/postgis/postgis-java/pull/60
+
+--- a/jdbc/src/main/java/org/postgis/DriverWrapper.java
++++ b/jdbc/src/main/java/org/postgis/DriverWrapper.java
+@@ -333,7 +333,7 @@ public class DriverWrapper extends Drive
+         }
+     }
+ 
+-    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++    public Logger getParentLogger() {
+         throw new UnsupportedOperationException("Not supported yet.");
+     }
+ }
+--- a/jdbc/pom.xml
++++ b/jdbc/pom.xml
+@@ -27,7 +27,7 @@
+         <dependency>
+             <groupId>org.postgresql</groupId>
+             <artifactId>postgresql</artifactId>
+-            <version>[9.4.1208.jre7,)</version>
++            <version>[42.2.2.jre7,)</version>
+         </dependency>
+     </dependencies>
+ 


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 add-classpath.patch
 upstream-version.patch
+driverwrapper.patch


=====================================
debian/patches/upstream-version.patch
=====================================
--- a/debian/patches/upstream-version.patch
+++ b/debian/patches/upstream-version.patch
@@ -1,5 +1,6 @@
 Description: Fix upstream version in pom.xml.
 Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
 
 --- a/jdbc/pom.xml
 +++ b/jdbc/pom.xml



View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis-java/compare/41e92ef7039378b836e0a1133bb85b2a182bd813...931384ee1fb17d47377867a2acfb9a094c87ca44

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis-java/compare/41e92ef7039378b836e0a1133bb85b2a182bd813...931384ee1fb17d47377867a2acfb9a094c87ca44
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180620/cd41908b/attachment-0001.html>