[Git][debian-gis-team/osmosis][master] 2 commits: Add upstream patch to fix build with postgis-java 2021.1.0.

Bas Couwenberg (@sebastic) gitlab at salsa.debian.org
Fri Aug 12 10:55:27 BST 2022 


Bas Couwenberg pushed to branch master at Debian GIS Project / osmosis


Commits:
2fc38e46 by Bas Couwenberg at 2022-08-12T11:33:19+02:00
Add upstream patch to fix build with postgis-java 2021.1.0.

- - - - -
9a413dda by Bas Couwenberg at 2022-08-12T11:47:40+02:00
Set distribution to unstable.

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/maven.rules
- + debian/patches/postgis-java-2021.1.0.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-osmosis (0.48.3-2) UNRELEASED; urgency=medium
+osmosis (0.48.3-2) unstable; urgency=medium
 
   * Bump watch file version to 4.
   * Update lintian overrides.
@@ -6,8 +6,9 @@ osmosis (0.48.3-2) UNRELEASED; urgency=medium
   * Update upstream metadata.
   * Update watch file for GitHub URL changes.
   * Bump debhelper compat to 12, no changes.
+  * Add upstream patch to fix build with postgis-java 2021.1.0.
 
- -- Bas Couwenberg <sebastic at debian.org>  Fri, 06 Nov 2020 19:41:16 +0100
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 12 Aug 2022 11:47:26 +0200
 
 osmosis (0.48.3-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -21,7 +21,7 @@ Build-Depends: debhelper-compat (= 12),
                libjpf-java,
                libmariadb-java,
 #               libnetty-3.9-java,
-               libpostgis-java,
+               libpostgis-java (>= 1:2021.1.0),
                libpostgresql-jdbc-java,
                libspring-beans-java,
                libspring-context-java,


=====================================
debian/maven.rules
=====================================
@@ -2,6 +2,6 @@
 junit junit * s/.*/4.x/ * *
 org.springframework spring-jdbc * s/.*/debian/ * *
 #s/org.jboss.netty/io.netty/ netty * s/.*/debian/ * *
-s/org.postgis/net.postgis/ postgis-jdbc * s/.*/debian/ * *
+net.postgis postgis-jdbc * s/.*/debian/ * *
 s/com.fasterxml.woodstox/org.codehaus.woodstox/ s/woodstox-core/woodstox-core-lgpl/ * s/.*/debian/ * *
 s/mysql/org.mariadb.jdbc/ s/mysql-connector-java/mariadb-java-client/ * s/.*/debian/ * *


=====================================
debian/patches/postgis-java-2021.1.0.patch
=====================================
@@ -0,0 +1,276 @@
+Description: Update imports for Postgis 2021.1.0
+Author: Taylor Smock <tsmock at fb.com>
+Origin: https://github.com/openstreetmap/osmosis/commit/9f495073253cab24f91277001c0ac2b9ae1dc4a8
+Forwarded: not-needed
+
+--- a/osmosis-pgsimple/build.gradle
++++ b/osmosis-pgsimple/build.gradle
+@@ -1,6 +1,6 @@
+ configurations {
+     // Exclude unnecessary postgis stub classes.
+-    all*.exclude group: 'org.postgis', module: 'postgis-stubs'
++    all*.exclude group: 'net.postgis', module: 'postgis-stubs'
+ }
+ 
+ dependencies {
+--- a/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/common/CopyFileWriter.java
++++ b/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/common/CopyFileWriter.java
+@@ -12,10 +12,10 @@ import java.util.Date;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+ 
++import net.postgis.jdbc.geometry.Geometry;
++import net.postgis.jdbc.geometry.binary.BinaryWriter;
+ import org.openstreetmap.osmosis.core.OsmosisRuntimeException;
+ import org.openstreetmap.osmosis.core.lifecycle.Completable;
+-import org.postgis.Geometry;
+-import org.postgis.binary.BinaryWriter;
+ 
+ 
+ /**
+--- a/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/common/PointBuilder.java
++++ b/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/common/PointBuilder.java
+@@ -1,7 +1,7 @@
+ // This software is released into the Public Domain.  See copying.txt for details.
+ package org.openstreetmap.osmosis.pgsimple.common;
+ 
+-import org.postgis.Point;
++import net.postgis.jdbc.geometry.Point;
+ 
+ 
+ /**
+--- a/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/common/PolygonBuilder.java
++++ b/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/common/PolygonBuilder.java
+@@ -1,10 +1,9 @@
+ // This software is released into the Public Domain.  See copying.txt for details.
+ package org.openstreetmap.osmosis.pgsimple.common;
+ 
+-import org.postgis.LinearRing;
+-import org.postgis.Point;
+-import org.postgis.Polygon;
+-
++import net.postgis.jdbc.geometry.LinearRing;
++import net.postgis.jdbc.geometry.Point;
++import net.postgis.jdbc.geometry.Polygon;
+ 
+ /**
+  * Builds PostGIS Polygon objects based on a series of points.
+--- a/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/v0_6/PostgreSqlWriter.java
++++ b/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/v0_6/PostgreSqlWriter.java
+@@ -9,6 +9,7 @@ import java.util.List;
+ import java.util.Map;
+ import java.util.logging.Logger;
+ 
++import net.postgis.jdbc.geometry.Geometry;
+ import org.openstreetmap.osmosis.core.OsmosisRuntimeException;
+ import org.openstreetmap.osmosis.core.container.v0_6.BoundContainer;
+ import org.openstreetmap.osmosis.core.container.v0_6.EntityContainer;
+@@ -42,7 +43,6 @@ import org.openstreetmap.osmosis.pgsimpl
+ import org.openstreetmap.osmosis.pgsimple.v0_6.impl.WayGeometryBuilder;
+ import org.openstreetmap.osmosis.pgsimple.v0_6.impl.WayMapper;
+ import org.openstreetmap.osmosis.pgsimple.v0_6.impl.WayNodeMapper;
+-import org.postgis.Geometry;
+ 
+ 
+ /**
+--- a/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/v0_6/impl/NodeMapper.java
++++ b/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/v0_6/impl/NodeMapper.java
+@@ -6,13 +6,12 @@ import java.sql.ResultSet;
+ import java.sql.SQLException;
+ import java.util.Date;
+ 
++import net.postgis.jdbc.PGgeometry;
++import net.postgis.jdbc.geometry.Point;
+ import org.openstreetmap.osmosis.core.OsmosisRuntimeException;
+ import org.openstreetmap.osmosis.core.domain.v0_6.CommonEntityData;
+ import org.openstreetmap.osmosis.core.domain.v0_6.Node;
+ import org.openstreetmap.osmosis.pgsimple.common.PointBuilder;
+-import org.postgis.PGgeometry;
+-import org.postgis.Point;
+-
+ 
+ /**
+  * Reads and writes node attributes to jdbc classes.
+--- a/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/v0_6/impl/PostgreSqlDatasetContext.java
++++ b/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/v0_6/impl/PostgreSqlDatasetContext.java
+@@ -8,9 +8,9 @@ import java.util.List;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+ 
+-import org.postgis.PGgeometry;
+-import org.postgis.Point;
+-import org.postgis.Polygon;
++import net.postgis.jdbc.PGgeometry;
++import net.postgis.jdbc.geometry.Point;
++import net.postgis.jdbc.geometry.Polygon;
+ 
+ import org.openstreetmap.osmosis.core.OsmosisConstants;
+ import org.openstreetmap.osmosis.core.OsmosisRuntimeException;
+--- a/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/v0_6/impl/WayGeometryBuilder.java
++++ b/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/v0_6/impl/WayGeometryBuilder.java
+@@ -4,6 +4,10 @@ package org.openstreetmap.osmosis.pgsimp
+ import java.util.ArrayList;
+ import java.util.List;
+ 
++import net.postgis.jdbc.geometry.LineString;
++import net.postgis.jdbc.geometry.LinearRing;
++import net.postgis.jdbc.geometry.Point;
++import net.postgis.jdbc.geometry.Polygon;
+ import org.openstreetmap.osmosis.core.OsmosisRuntimeException;
+ import org.openstreetmap.osmosis.core.domain.v0_6.Node;
+ import org.openstreetmap.osmosis.core.domain.v0_6.Way;
+@@ -15,10 +19,6 @@ import org.openstreetmap.osmosis.pgsimpl
+ import org.openstreetmap.osmosis.pgsimple.common.NodeLocationStore;
+ import org.openstreetmap.osmosis.pgsimple.common.NodeLocationStoreType;
+ import org.openstreetmap.osmosis.pgsimple.common.PersistentNodeLocationStore;
+-import org.postgis.LineString;
+-import org.postgis.LinearRing;
+-import org.postgis.Point;
+-import org.postgis.Polygon;
+ 
+ 
+ /**
+--- a/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/v0_6/impl/WayMapper.java
++++ b/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/v0_6/impl/WayMapper.java
+@@ -8,12 +8,11 @@ import java.util.ArrayList;
+ import java.util.Date;
+ import java.util.List;
+ 
++import net.postgis.jdbc.PGgeometry;
++import net.postgis.jdbc.geometry.Geometry;
+ import org.openstreetmap.osmosis.core.OsmosisRuntimeException;
+ import org.openstreetmap.osmosis.core.domain.v0_6.CommonEntityData;
+ import org.openstreetmap.osmosis.core.domain.v0_6.Way;
+-import org.postgis.Geometry;
+-import org.postgis.PGgeometry;
+-
+ 
+ /**
+  * Reads and writes way attributes to jdbc classes.
+--- a/osmosis-pgsnapshot/build.gradle
++++ b/osmosis-pgsnapshot/build.gradle
+@@ -1,6 +1,6 @@
+ configurations {
+     // Exclude unnecessary postgis stub classes.
+-    all*.exclude group: 'org.postgis', module: 'postgis-stubs'
++    all*.exclude group: 'net.postgis', module: 'postgis-stubs'
+ }
+ 
+ dependencies {
+--- a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/common/CopyFileWriter.java
++++ b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/common/CopyFileWriter.java
+@@ -13,10 +13,10 @@ import java.util.List;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+ 
++import net.postgis.jdbc.geometry.Geometry;
++import net.postgis.jdbc.geometry.binary.BinaryWriter;
+ import org.openstreetmap.osmosis.core.OsmosisRuntimeException;
+ import org.openstreetmap.osmosis.core.lifecycle.Completable;
+-import org.postgis.Geometry;
+-import org.postgis.binary.BinaryWriter;
+ import org.postgresql.util.PGobject;
+ 
+ 
+--- a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/common/PointBuilder.java
++++ b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/common/PointBuilder.java
+@@ -1,8 +1,7 @@
+ // This software is released into the Public Domain.  See copying.txt for details.
+ package org.openstreetmap.osmosis.pgsnapshot.common;
+ 
+-import org.postgis.Point;
+-
++import net.postgis.jdbc.geometry.Point;
+ 
+ /**
+  * Builds PostGIS Point objects based on a set of coordinates.
+--- a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/common/PolygonBuilder.java
++++ b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/common/PolygonBuilder.java
+@@ -1,10 +1,9 @@
+ // This software is released into the Public Domain.  See copying.txt for details.
+ package org.openstreetmap.osmosis.pgsnapshot.common;
+ 
+-import org.postgis.LinearRing;
+-import org.postgis.Point;
+-import org.postgis.Polygon;
+-
++import net.postgis.jdbc.geometry.LinearRing;
++import net.postgis.jdbc.geometry.Point;
++import net.postgis.jdbc.geometry.Polygon;
+ 
+ /**
+  * Builds PostGIS Polygon objects based on a series of points.
+--- a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/NodeMapper.java
++++ b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/NodeMapper.java
+@@ -3,9 +3,9 @@ package org.openstreetmap.osmosis.pgsnap
+ 
+ import java.util.Map;
+ 
++import net.postgis.jdbc.PGgeometry;
+ import org.openstreetmap.osmosis.core.domain.v0_6.Node;
+ import org.openstreetmap.osmosis.pgsnapshot.common.PointBuilder;
+-import org.postgis.PGgeometry;
+ import org.springframework.jdbc.core.RowMapper;
+ 
+ 
+--- a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/NodeRowMapper.java
++++ b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/NodeRowMapper.java
+@@ -4,9 +4,9 @@ package org.openstreetmap.osmosis.pgsnap
+ import java.sql.ResultSet;
+ import java.sql.SQLException;
+ 
++import net.postgis.jdbc.PGgeometry;
++import net.postgis.jdbc.geometry.Point;
+ import org.openstreetmap.osmosis.core.domain.v0_6.Node;
+-import org.postgis.PGgeometry;
+-import org.postgis.Point;
+ 
+ 
+ /**
+--- a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/PostgreSqlDatasetContext.java
++++ b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/PostgreSqlDatasetContext.java
+@@ -5,6 +5,9 @@ import java.util.ArrayList;
+ import java.util.List;
+ import java.util.logging.Logger;
+ 
++import net.postgis.jdbc.PGgeometry;
++import net.postgis.jdbc.geometry.Point;
++import net.postgis.jdbc.geometry.Polygon;
+ import org.openstreetmap.osmosis.core.OsmosisConstants;
+ import org.openstreetmap.osmosis.core.container.v0_6.BoundContainer;
+ import org.openstreetmap.osmosis.core.container.v0_6.BoundContainerIterator;
+@@ -31,9 +34,6 @@ import org.openstreetmap.osmosis.pgsnaps
+ import org.openstreetmap.osmosis.pgsnapshot.common.PolygonBuilder;
+ import org.openstreetmap.osmosis.pgsnapshot.common.SchemaVersionValidator;
+ import org.openstreetmap.osmosis.pgsnapshot.v0_6.PostgreSqlVersionConstants;
+-import org.postgis.PGgeometry;
+-import org.postgis.Point;
+-import org.postgis.Polygon;
+ import org.springframework.jdbc.core.JdbcTemplate;
+ 
+ 
+--- a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/WayGeometryBuilder.java
++++ b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/WayGeometryBuilder.java
+@@ -4,6 +4,10 @@ package org.openstreetmap.osmosis.pgsnap
+ import java.util.ArrayList;
+ import java.util.List;
+ 
++import net.postgis.jdbc.geometry.LineString;
++import net.postgis.jdbc.geometry.LinearRing;
++import net.postgis.jdbc.geometry.Point;
++import net.postgis.jdbc.geometry.Polygon;
+ import org.openstreetmap.osmosis.core.OsmosisRuntimeException;
+ import org.openstreetmap.osmosis.core.domain.v0_6.Node;
+ import org.openstreetmap.osmosis.core.domain.v0_6.Way;
+@@ -15,11 +19,6 @@ import org.openstreetmap.osmosis.pgsnaps
+ import org.openstreetmap.osmosis.pgsnapshot.common.NodeLocationStore;
+ import org.openstreetmap.osmosis.pgsnapshot.common.NodeLocationStoreType;
+ import org.openstreetmap.osmosis.pgsnapshot.common.PersistentNodeLocationStore;
+-import org.postgis.LineString;
+-import org.postgis.LinearRing;
+-import org.postgis.Point;
+-import org.postgis.Polygon;
+-
+ 
+ /**
+  * Caches a set of node latitudes and longitudes and uses these to calculate the


=====================================
debian/patches/series
=====================================
@@ -4,3 +4,4 @@
 disable-netty3.patch
 mariadb.patch
 no-shadow.patch
+postgis-java-2021.1.0.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/osmosis/-/compare/3c24d45276bd8bf0b2827e5fdf829d2508fda468...9a413dda8e4d7a42980a61b627b4c70519087cb9

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmosis/-/compare/3c24d45276bd8bf0b2827e5fdf829d2508fda468...9a413dda8e4d7a42980a61b627b4c70519087cb9
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/20220812/9cfdc10c/attachment-0001.htm>

More information about the Pkg-grass-devel mailing list