Your message dated Thu, 23 Aug 2018 10:08:01 +0000
with message-id <[email protected]>
and subject line Bug#902789: fixed in spatial4j-0.4 0.4.1-5
has caused the Debian Bug report #902789,
regarding spatial4j-0.4: Add support for JTS 1.15
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
902789: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=902789
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: spatial4j-0.4
Version: 0.4.1-4
Severity: important
Tags: patch
User: [email protected]
Usertags: jts-1.15
Dear Maintainer,
Your packages FTBFS with JTS 1.15 available in expermental.
The attached patch fixes the build failure.
To quote the MIGRATION documentation:
"
JTS Upgrade Guide
=================
The JTS Topology Suite has a long history, and in 2016/2017,
[Vivid Solutions](http://www.vividsolutions.com/) brought the project
to the LocationTech working group of the Eclipse Foundation.
During that transition, the Java package names and Maven GAVs have
changed. For package names (typically used in imports), the change is
reflected below:
| | **JTS 1.14.0 and before** | **JTS 1.15.0 and later** |
|---------------|:--------------------------|:----------------------------|
| Maven GroupId | com.vividsolutions | org.locationtech.jts |
| Package names | com.vividsolutions.jts.* | org.locationtech.jts.* |
To upgrade a Maven project (or another build tool using Maven dependency
management), one can do a find and replace on ```pom.xml``` files (or
similiar build files). In the source code, one could do a find and
replace on the package names. As a concrete example, one could use
these two commands to handle most of the migration.
```
git grep -l com.vividsolutions | grep pom.xml | xargs sed -i
"s/com.vividsolutions/org.locationtech.jts/g"
git grep -l com.vividsolutions | xargs sed -i
"s/com.vividsolutions/org.locationtech/g"
```
## Using JTS with Maven
To include JTS in a Maven project, add a dependency block like the following:
```xml
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>${jts.version}</version>
</dependency>
```
Where ${jts.version} is the released version of JTS one chooses to use.
See the [releases](https://github.com/locationtech/jts/releases) page
for options.
"
https://salsa.debian.org/debian-gis-team/jts/blob/upstream/1.15.1+ds/MIGRATION.md
The severity of this issue will be raised when the jts package is moved
from experimental to unstable.
Please note that JTS is up for adoption (#884537), as it should be better
to maintain the package as part of the Java team where its reverse
dependencies are maintained as well.
Kind Regards,
Bas
diff -Nru spatial4j-0.4-0.4.1/debian/changelog
spatial4j-0.4-0.4.1/debian/changelog
--- spatial4j-0.4-0.4.1/debian/changelog 2016-02-17 00:22:47.000000000
+0100
+++ spatial4j-0.4-0.4.1/debian/changelog 2018-06-30 22:11:22.000000000
+0200
@@ -1,3 +1,10 @@
+spatial4j-0.4 (0.4.1-4.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Add support for JTS 1.15.
+
+ -- Bas Couwenberg <[email protected]> Sat, 30 Jun 2018 22:11:22 +0200
+
spatial4j-0.4 (0.4.1-4) unstable; urgency=medium
* Team upload.
diff -Nru spatial4j-0.4-0.4.1/debian/maven.rules
spatial4j-0.4-0.4.1/debian/maven.rules
--- spatial4j-0.4-0.4.1/debian/maven.rules 2016-02-17 00:22:47.000000000
+0100
+++ spatial4j-0.4-0.4.1/debian/maven.rules 2018-06-30 22:11:22.000000000
+0200
@@ -1,3 +1,4 @@
com.spatial4j spatial4j * s/.*/0.4.x/ * *
junit junit * s/.*/4.x/ * *
+s/com.vividsolutions/org.locationtech.jts/ s/jts/jts-core/ * s/.*/debian/ * *
diff -Nru spatial4j-0.4-0.4.1/debian/patches/jts-1.15.patch
spatial4j-0.4-0.4.1/debian/patches/jts-1.15.patch
--- spatial4j-0.4-0.4.1/debian/patches/jts-1.15.patch 1970-01-01
01:00:00.000000000 +0100
+++ spatial4j-0.4-0.4.1/debian/patches/jts-1.15.patch 2018-06-30
22:11:22.000000000 +0200
@@ -0,0 +1,374 @@
+Description: Update for JTS 1.15.
+Author: Bas Couwenberg <[email protected]>
+
+--- a/pom.xml
++++ b/pom.xml
+@@ -103,10 +103,10 @@
+
+ <!-- JTS is essentially only used for polygons. -->
+ <dependency>
+- <groupId>com.vividsolutions</groupId>
+- <artifactId>jts</artifactId>
++ <groupId>org.locationtech.jts</groupId>
++ <artifactId>jts-core</artifactId>
+ <!-- last I checked, it still works with 1.12 -->
+- <version>1.13</version>
++ <version>1.15</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+--- a/src/main/java/com/spatial4j/core/context/jts/JtsSpatialContext.java
++++ b/src/main/java/com/spatial4j/core/context/jts/JtsSpatialContext.java
+@@ -25,8 +25,8 @@ import com.spatial4j.core.shape.Rectangl
+ import com.spatial4j.core.shape.Shape;
+ import com.spatial4j.core.shape.jts.JtsGeometry;
+ import com.spatial4j.core.shape.jts.JtsPoint;
+-import com.vividsolutions.jts.geom.*;
+-import com.vividsolutions.jts.util.GeometricShapeFactory;
++import org.locationtech.jts.geom.*;
++import org.locationtech.jts.util.GeometricShapeFactory;
+
+ import java.util.ArrayList;
+ import java.util.Collection;
+@@ -190,7 +190,7 @@ public class JtsSpatialContext extends S
+
+ /**
+ * INTERNAL
+- * @see #makeShape(com.vividsolutions.jts.geom.Geometry)
++ * @see #makeShape(org.locationtech.jts.geom.Geometry)
+ *
+ * @param geom Non-null
+ * @param dateline180Check if both this is true and {@link #isGeo()}, then
JtsGeometry will check
+---
a/src/main/java/com/spatial4j/core/context/jts/JtsSpatialContextFactory.java
++++
b/src/main/java/com/spatial4j/core/context/jts/JtsSpatialContextFactory.java
+@@ -20,10 +20,10 @@ package com.spatial4j.core.context.jts;
+ import com.spatial4j.core.context.SpatialContextFactory;
+ import com.spatial4j.core.io.jts.JtsBinaryCodec;
+ import com.spatial4j.core.io.jts.JtsWktShapeParser;
+-import com.vividsolutions.jts.geom.CoordinateSequenceFactory;
+-import com.vividsolutions.jts.geom.GeometryFactory;
+-import com.vividsolutions.jts.geom.PrecisionModel;
+-import com.vividsolutions.jts.geom.impl.CoordinateArraySequenceFactory;
++import org.locationtech.jts.geom.CoordinateSequenceFactory;
++import org.locationtech.jts.geom.GeometryFactory;
++import org.locationtech.jts.geom.PrecisionModel;
++import org.locationtech.jts.geom.impl.CoordinateArraySequenceFactory;
+
+ import java.util.Map;
+
+@@ -45,9 +45,9 @@ import java.util.Map;
+ * <DD>true|false(default) -- see {@link
JtsSpatialContext#isAllowMultiOverlap()}</DD>
+ * <DT>precisionModel</DT>
+ * <DD>floating(default) | floating_single | fixed
+- * -- see {@link com.vividsolutions.jts.geom.PrecisionModel}.
++ * -- see {@link org.locationtech.jts.geom.PrecisionModel}.
+ * If {@code fixed} then you must also provide {@code precisionScale}
+- * -- see {@link com.vividsolutions.jts.geom.PrecisionModel#getScale()}</DD>
++ * -- see {@link org.locationtech.jts.geom.PrecisionModel#getScale()}</DD>
+ * </DL>
+ */
+ public class JtsSpatialContextFactory extends SpatialContextFactory {
+--- a/src/main/java/com/spatial4j/core/io/jts/JtsBinaryCodec.java
++++ b/src/main/java/com/spatial4j/core/io/jts/JtsBinaryCodec.java
+@@ -22,14 +22,14 @@ import com.spatial4j.core.context.jts.Jt
+ import com.spatial4j.core.exception.InvalidShapeException;
+ import com.spatial4j.core.io.BinaryCodec;
+ import com.spatial4j.core.shape.Shape;
+-import com.vividsolutions.jts.geom.Geometry;
+-import com.vividsolutions.jts.geom.PrecisionModel;
+-import com.vividsolutions.jts.io.InStream;
+-import com.vividsolutions.jts.io.OutStream;
+-import com.vividsolutions.jts.io.ParseException;
+-import com.vividsolutions.jts.io.WKBConstants;
+-import com.vividsolutions.jts.io.WKBReader;
+-import com.vividsolutions.jts.io.WKBWriter;
++import org.locationtech.jts.geom.Geometry;
++import org.locationtech.jts.geom.PrecisionModel;
++import org.locationtech.jts.io.InStream;
++import org.locationtech.jts.io.OutStream;
++import org.locationtech.jts.io.ParseException;
++import org.locationtech.jts.io.WKBConstants;
++import org.locationtech.jts.io.WKBReader;
++import org.locationtech.jts.io.WKBWriter;
+
+ import java.io.DataInput;
+ import java.io.DataOutput;
+--- a/src/main/java/com/spatial4j/core/io/jts/JtsWKTReaderShapeParser.java
++++ b/src/main/java/com/spatial4j/core/io/jts/JtsWKTReaderShapeParser.java
+@@ -23,19 +23,19 @@ import com.spatial4j.core.distance.Dista
+ import com.spatial4j.core.exception.InvalidShapeException;
+ import com.spatial4j.core.shape.Shape;
+ import com.spatial4j.core.shape.jts.JtsPoint;
+-import com.vividsolutions.jts.geom.CoordinateSequence;
+-import com.vividsolutions.jts.geom.CoordinateSequenceFilter;
+-import com.vividsolutions.jts.geom.Geometry;
+-import com.vividsolutions.jts.io.WKTReader;
++import org.locationtech.jts.geom.CoordinateSequence;
++import org.locationtech.jts.geom.CoordinateSequenceFilter;
++import org.locationtech.jts.geom.Geometry;
++import org.locationtech.jts.io.WKTReader;
+
+ import java.text.ParseException;
+
+ /**
+ * This is an extension of {@link JtsWktShapeParser} that processes the entire
+- * string with JTS's {@link com.vividsolutions.jts.io.WKTReader}. Some
differences:
++ * string with JTS's {@link org.locationtech.jts.io.WKTReader}. Some
differences:
+ * <ul>
+ * <li>No support for ENVELOPE and BUFFER</li>
+- * <li>MULTI* shapes use JTS's {@link
com.vividsolutions.jts.geom.GeometryCollection} subclasses,
++ * <li>MULTI* shapes use JTS's {@link
org.locationtech.jts.geom.GeometryCollection} subclasses,
+ * not {@link com.spatial4j.core.shape.ShapeCollection}</li>
+ * <li>'Z' coordinates are saved into the geometry</li>
+ * </ul>
+@@ -55,7 +55,7 @@ public class JtsWKTReaderShapeParser ext
+ }
+
+ /**
+- * Reads WKT from the {@code str} via JTS's {@link
com.vividsolutions.jts.io.WKTReader}.
++ * Reads WKT from the {@code str} via JTS's {@link
org.locationtech.jts.io.WKTReader}.
+ * @param str
+ * @param reader <pre>new WKTReader(ctx.getGeometryFactory()))</pre>
+ * @return Non-Null
+@@ -67,8 +67,8 @@ public class JtsWKTReaderShapeParser ext
+ //Normalizes & verifies coordinates
+ checkCoordinates(geom);
+
+- if (geom instanceof com.vividsolutions.jts.geom.Point) {
+- com.vividsolutions.jts.geom.Point ptGeom =
(com.vividsolutions.jts.geom.Point) geom;
++ if (geom instanceof org.locationtech.jts.geom.Point) {
++ org.locationtech.jts.geom.Point ptGeom =
(org.locationtech.jts.geom.Point) geom;
+ if (ctx.useJtsPoint())
+ return new JtsPoint(ptGeom, ctx);
+ else
+--- a/src/main/java/com/spatial4j/core/io/jts/JtsWktShapeParser.java
++++ b/src/main/java/com/spatial4j/core/io/jts/JtsWktShapeParser.java
+@@ -24,13 +24,13 @@ import com.spatial4j.core.shape.Point;
+ import com.spatial4j.core.shape.Rectangle;
+ import com.spatial4j.core.shape.Shape;
+ import com.spatial4j.core.shape.jts.JtsGeometry;
+-import com.vividsolutions.jts.algorithm.CGAlgorithms;
+-import com.vividsolutions.jts.geom.Coordinate;
+-import com.vividsolutions.jts.geom.Envelope;
+-import com.vividsolutions.jts.geom.Geometry;
+-import com.vividsolutions.jts.geom.GeometryFactory;
+-import com.vividsolutions.jts.geom.LinearRing;
+-import com.vividsolutions.jts.geom.Polygon;
++import org.locationtech.jts.algorithm.CGAlgorithms;
++import org.locationtech.jts.geom.Coordinate;
++import org.locationtech.jts.geom.Envelope;
++import org.locationtech.jts.geom.Geometry;
++import org.locationtech.jts.geom.GeometryFactory;
++import org.locationtech.jts.geom.LinearRing;
++import org.locationtech.jts.geom.Polygon;
+
+ import java.text.ParseException;
+ import java.util.ArrayList;
+@@ -226,7 +226,7 @@ public class JtsWktShapeParser extends W
+ }
+
+ /**
+- * Reads a {@link com.vividsolutions.jts.geom.Coordinate} from the current
position.
++ * Reads a {@link org.locationtech.jts.geom.Coordinate} from the current
position.
+ * It's akin to {@link #point(com.spatial4j.core.io.WktShapeParser.State)}
but for
+ * a JTS Coordinate. Only the first 2 numbers are parsed; any remaining
are ignored.
+ */
+@@ -298,7 +298,7 @@ public class JtsWktShapeParser extends W
+ /** Geometries will not be validated (because it's kinda expensive to
calculate). You may or may
+ * not ultimately get an error at some point; results are undefined.
However, note that
+ * coordinates will still be validated for falling within the world
boundaries.
+- * @see com.vividsolutions.jts.geom.Geometry#isValid(). */
++ * @see org.locationtech.jts.geom.Geometry#isValid(). */
+ none,
+
+ /** Geometries will be explicitly validated on creation, possibly
resulting in an exception:
+@@ -307,7 +307,7 @@ public class JtsWktShapeParser extends W
+
+ /** Invalid Geometries are repaired by taking the convex hull. The result
will very likely be a
+ * larger shape that matches false-positives, but no false-negatives.
+- * See {@link com.vividsolutions.jts.geom.Geometry#convexHull()}. */
++ * See {@link org.locationtech.jts.geom.Geometry#convexHull()}. */
+ repairConvexHull,
+
+ /** Invalid polygons are repaired using the {@code buffer(0)} technique.
From the <a
+--- a/src/main/java/com/spatial4j/core/shape/jts/JtsGeometry.java
++++ b/src/main/java/com/spatial4j/core/shape/jts/JtsGeometry.java
+@@ -29,23 +29,23 @@ import com.spatial4j.core.shape.impl.Buf
+ import com.spatial4j.core.shape.impl.PointImpl;
+ import com.spatial4j.core.shape.impl.Range;
+ import com.spatial4j.core.shape.impl.RectangleImpl;
+-import com.vividsolutions.jts.geom.Coordinate;
+-import com.vividsolutions.jts.geom.CoordinateSequence;
+-import com.vividsolutions.jts.geom.CoordinateSequenceFilter;
+-import com.vividsolutions.jts.geom.Envelope;
+-import com.vividsolutions.jts.geom.Geometry;
+-import com.vividsolutions.jts.geom.GeometryCollection;
+-import com.vividsolutions.jts.geom.GeometryFilter;
+-import com.vividsolutions.jts.geom.IntersectionMatrix;
+-import com.vividsolutions.jts.geom.LineString;
+-import com.vividsolutions.jts.geom.Lineal;
+-import com.vividsolutions.jts.geom.LinearRing;
+-import com.vividsolutions.jts.geom.Polygon;
+-import com.vividsolutions.jts.geom.Puntal;
+-import com.vividsolutions.jts.geom.prep.PreparedGeometry;
+-import com.vividsolutions.jts.geom.prep.PreparedGeometryFactory;
+-import com.vividsolutions.jts.operation.union.UnaryUnionOp;
+-import com.vividsolutions.jts.operation.valid.IsValidOp;
++import org.locationtech.jts.geom.Coordinate;
++import org.locationtech.jts.geom.CoordinateSequence;
++import org.locationtech.jts.geom.CoordinateSequenceFilter;
++import org.locationtech.jts.geom.Envelope;
++import org.locationtech.jts.geom.Geometry;
++import org.locationtech.jts.geom.GeometryCollection;
++import org.locationtech.jts.geom.GeometryFilter;
++import org.locationtech.jts.geom.IntersectionMatrix;
++import org.locationtech.jts.geom.LineString;
++import org.locationtech.jts.geom.Lineal;
++import org.locationtech.jts.geom.LinearRing;
++import org.locationtech.jts.geom.Polygon;
++import org.locationtech.jts.geom.Puntal;
++import org.locationtech.jts.geom.prep.PreparedGeometry;
++import org.locationtech.jts.geom.prep.PreparedGeometryFactory;
++import org.locationtech.jts.operation.union.UnaryUnionOp;
++import org.locationtech.jts.operation.valid.IsValidOp;
+
+ import java.util.ArrayList;
+ import java.util.List;
+@@ -129,7 +129,7 @@ public class JtsGeometry implements Shap
+
+ /**
+ * Adds an index to this class internally to compute spatial relations
faster. In JTS this
+- * is called a {@link com.vividsolutions.jts.geom.prep.PreparedGeometry}.
This
++ * is called a {@link org.locationtech.jts.geom.prep.PreparedGeometry}.
This
+ * isn't done by default because it takes some time to do the optimization,
and it uses more
+ * memory. Calling this method isn't thread-safe so be careful when this
is done. If it was
+ * already indexed then nothing happens.
+@@ -276,7 +276,7 @@ public class JtsGeometry implements Shap
+
+ protected SpatialRelation relate(Geometry oGeom) {
+ //see
http://docs.geotools.org/latest/userguide/library/jts/dim9.html#preparedgeometry
+- if (oGeom instanceof com.vividsolutions.jts.geom.Point) {
++ if (oGeom instanceof org.locationtech.jts.geom.Point) {
+ if (preparedGeometry != null)
+ return preparedGeometry.disjoint(oGeom) ? SpatialRelation.DISJOINT :
SpatialRelation.CONTAINS;
+ return geom.disjoint(oGeom) ? SpatialRelation.DISJOINT :
SpatialRelation.CONTAINS;
+@@ -331,7 +331,7 @@ public class JtsGeometry implements Shap
+ * If <code>geom</code> spans the dateline, then this modifies it to be a
+ * valid JTS geometry that extends to the right of the standard -180 to +180
+ * width such that some points are greater than +180 but some remain less.
+- * Takes care to invoke {@link
com.vividsolutions.jts.geom.Geometry#geometryChanged()}
++ * Takes care to invoke {@link
org.locationtech.jts.geom.Geometry#geometryChanged()}
+ * if needed.
+ *
+ * @return The number of times the geometry spans the dateline. >= 0
+--- a/src/main/java/com/spatial4j/core/shape/jts/JtsPoint.java
++++ b/src/main/java/com/spatial4j/core/shape/jts/JtsPoint.java
+@@ -25,23 +25,23 @@ import com.spatial4j.core.shape.Rectangl
+ import com.spatial4j.core.shape.Shape;
+ import com.spatial4j.core.shape.SpatialRelation;
+ import com.spatial4j.core.shape.impl.PointImpl;
+-import com.vividsolutions.jts.geom.CoordinateSequence;
++import org.locationtech.jts.geom.CoordinateSequence;
+
+-/** Wraps a {@link com.vividsolutions.jts.geom.Point}. */
++/** Wraps a {@link org.locationtech.jts.geom.Point}. */
+ public class JtsPoint implements Point {
+
+ private final SpatialContext ctx;
+- private com.vividsolutions.jts.geom.Point pointGeom;
++ private org.locationtech.jts.geom.Point pointGeom;
+ private final boolean empty;//cached
+
+ /** A simple constructor without normalization / validation. */
+- public JtsPoint(com.vividsolutions.jts.geom.Point pointGeom, SpatialContext
ctx) {
++ public JtsPoint(org.locationtech.jts.geom.Point pointGeom, SpatialContext
ctx) {
+ this.ctx = ctx;
+ this.pointGeom = pointGeom;
+ this.empty = pointGeom.isEmpty();
+ }
+
+- public com.vividsolutions.jts.geom.Point getGeom() {
++ public org.locationtech.jts.geom.Point getGeom() {
+ return pointGeom;
+ }
+
+--- a/src/test/java/com/spatial4j/core/io/JtsBinaryCodecTest.java
++++ b/src/test/java/com/spatial4j/core/io/JtsBinaryCodecTest.java
+@@ -21,10 +21,10 @@ import com.carrotsearch.randomizedtestin
+ import com.spatial4j.core.context.jts.JtsSpatialContext;
+ import com.spatial4j.core.context.jts.JtsSpatialContextFactory;
+ import com.spatial4j.core.shape.Shape;
+-import com.vividsolutions.jts.geom.Coordinate;
+-import com.vividsolutions.jts.geom.Geometry;
+-import com.vividsolutions.jts.geom.PrecisionModel;
+-import com.vividsolutions.jts.util.GeometricShapeFactory;
++import org.locationtech.jts.geom.Coordinate;
++import org.locationtech.jts.geom.Geometry;
++import org.locationtech.jts.geom.PrecisionModel;
++import org.locationtech.jts.util.GeometricShapeFactory;
+ import org.junit.Test;
+
+ import java.util.Arrays;
+--- a/src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java
++++ b/src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java
+@@ -24,8 +24,8 @@ import com.spatial4j.core.shape.Rectangl
+ import com.spatial4j.core.shape.Shape;
+ import com.spatial4j.core.shape.SpatialRelation;
+ import com.spatial4j.core.shape.jts.JtsGeometry;
+-import com.vividsolutions.jts.geom.Coordinate;
+-import com.vividsolutions.jts.geom.GeometryFactory;
++import org.locationtech.jts.geom.Coordinate;
++import org.locationtech.jts.geom.GeometryFactory;
+ import org.junit.Test;
+
+ import java.text.ParseException;
+--- a/src/test/java/com/spatial4j/core/io/PolygonBuilder.java
++++ b/src/test/java/com/spatial4j/core/io/PolygonBuilder.java
+@@ -20,9 +20,9 @@ package com.spatial4j.core.io;
+ import com.spatial4j.core.context.jts.JtsSpatialContext;
+ import com.spatial4j.core.shape.Shape;
+ import com.spatial4j.core.shape.jts.JtsGeometry;
+-import com.vividsolutions.jts.geom.Coordinate;
+-import com.vividsolutions.jts.geom.LinearRing;
+-import com.vividsolutions.jts.geom.Polygon;
++import org.locationtech.jts.geom.Coordinate;
++import org.locationtech.jts.geom.LinearRing;
++import org.locationtech.jts.geom.Polygon;
+
+ import java.util.ArrayList;
+ import java.util.List;
+@@ -82,7 +82,7 @@ public class PolygonBuilder {
+ }
+
+ /**
+- * Creates the raw {@link com.vividsolutions.jts.geom.Polygon}
++ * Creates the raw {@link org.locationtech.jts.geom.Polygon}
+ *
+ * @return Built polygon
+ */
+@@ -93,7 +93,7 @@ public class PolygonBuilder {
+ }
+
+ /**
+- * Builder for defining a hole in a {@link
com.vividsolutions.jts.geom.Polygon}
++ * Builder for defining a hole in a {@link
org.locationtech.jts.geom.Polygon}
+ */
+ public class PolygonHoleBuilder {
+
+--- a/src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java
++++ b/src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java
+@@ -24,10 +24,10 @@ import com.spatial4j.core.context.jts.Jt
+ import com.spatial4j.core.io.jts.JtsWktShapeParser;
+ import com.spatial4j.core.shape.impl.PointImpl;
+ import com.spatial4j.core.shape.jts.JtsGeometry;
+-import com.vividsolutions.jts.geom.Coordinate;
+-import com.vividsolutions.jts.geom.CoordinateFilter;
+-import com.vividsolutions.jts.geom.Geometry;
+-import com.vividsolutions.jts.geom.IntersectionMatrix;
++import org.locationtech.jts.geom.Coordinate;
++import org.locationtech.jts.geom.CoordinateFilter;
++import org.locationtech.jts.geom.Geometry;
++import org.locationtech.jts.geom.IntersectionMatrix;
+ import org.junit.Test;
+
+ import java.io.BufferedReader;
diff -Nru spatial4j-0.4-0.4.1/debian/patches/series
spatial4j-0.4-0.4.1/debian/patches/series
--- spatial4j-0.4-0.4.1/debian/patches/series 1970-01-01 01:00:00.000000000
+0100
+++ spatial4j-0.4-0.4.1/debian/patches/series 2018-06-30 22:11:22.000000000
+0200
@@ -0,0 +1 @@
+jts-1.15.patch
--- End Message ---
--- Begin Message ---
Source: spatial4j-0.4
Source-Version: 0.4.1-5
We believe that the bug you reported is fixed in the latest version of
spatial4j-0.4, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Markus Koschany <[email protected]> (supplier of updated spatial4j-0.4 package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Thu, 23 Aug 2018 11:20:45 +0200
Source: spatial4j-0.4
Binary: libspatial4j-0.4-java
Architecture: source
Version: 0.4.1-5
Distribution: unstable
Urgency: medium
Maintainer: Debian Java Maintainers
<[email protected]>
Changed-By: Markus Koschany <[email protected]>
Description:
libspatial4j-0.4-java - spatial/geospatial Java library
Closes: 902789
Changes:
spatial4j-0.4 (0.4.1-5) unstable; urgency=medium
.
* Team upload.
* Switch to compat level 11.
* Declare compliance with Debian Policy 4.2.0.
* Add support for JTS 1.15.
Thanks to Bas Couwenberg for the report and patch. (Closes: #902789)
Checksums-Sha1:
fba1f3b68d31a566fb86b1a3ab0029587a2e5631 2330 spatial4j-0.4_0.4.1-5.dsc
8dc836df0e51f672390fd90ea1adc36ebe4e9e25 6272
spatial4j-0.4_0.4.1-5.debian.tar.xz
c7b8400b36966d07d85652ecf9c873425225944c 15659
spatial4j-0.4_0.4.1-5_amd64.buildinfo
Checksums-Sha256:
0f1f4be7ba45a35be94f808439670feccde530df318f95c412b2b9c3bdb68227 2330
spatial4j-0.4_0.4.1-5.dsc
c54c13f39e013def884755953bf475207918d19fe7ce3c5d988971f8e0111acd 6272
spatial4j-0.4_0.4.1-5.debian.tar.xz
f06cbb07f7b210fffcf08848a7ff4c98034dbe3313ea8cf15a20b233e59de576 15659
spatial4j-0.4_0.4.1-5_amd64.buildinfo
Files:
2922335a7cd3f60ecafc2570040531aa 2330 java optional spatial4j-0.4_0.4.1-5.dsc
5e99cb5bc7c78e6af07d8bc2a1eb60c1 6272 java optional
spatial4j-0.4_0.4.1-5.debian.tar.xz
837eb0478f5fbc9e3d17bef3149f0fa7 15659 java optional
spatial4j-0.4_0.4.1-5_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQKjBAEBCgCNFiEErPPQiO8y7e9qGoNf2a0UuVE7UeQFAlt+fYtfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEFD
RjNEMDg4RUYzMkVERUY2QTFBODM1RkQ5QUQxNEI5NTEzQjUxRTQPHGFwb0BkZWJp
YW4ub3JnAAoJENmtFLlRO1HkVaUP/3dp/68nDSRXTEu7xD1rInAB2hSVGIEvwy4U
dxMVfH5rU0fjtAtbE1eaXozppsTysEluci9WxLzkD68vlTJGj04wUAELpPxYY+uG
28mld9KOHxHmrko5P0lxeDc5cHzs4/RJqyAv92sIRl5MxUqZJHS9FtPEDrQ0SYmy
z9G7vliocPx8QgRVhe2LiQ8ZHM2CoGQFgdGdOYH2ggVL9zkNbxa/RmPAydUyAuHV
j3nwKyD+bVr0/ztreWIQJCJyPTw9N1u2ozBIEdZe1ok/BqwRzLnl35HT31dFjEK8
gEH+b99VrFsYryZyO6vsOG9fYw6J/tqWA/XNWZkNkQNC1235Tc8d9G9Wk7SS58yy
4kYcJMInzS1vvXHG7S0uBUQNYY3/1fpr7wyeNFO1o5xOR7UCaLiNroCQTf2UseIe
V2rL8rcoVMGmF98FcyNpHu/H+Pt9cGGFVR7UqbnGe6HTuq+4x79/4f/uRuKs4sYt
ru/sACRCMk/lJMlPhOG36f22/UKsj5aLrj1cNbaFhd+U3T1YqW3i4JbLxe7tfXBP
XgSVjeA0blCQ7ESvySr+NTX/6zxDLUu6cUs8Z+KSGvlSKWSYo46YPL+NR2fJ4UyM
3dZ7Ba+1SQQl8+JMfIzq/coQhBBwcTVjrczZVr0vtPeN/x4Rjy/1bB+sivnLrbqx
eOt9M46r
=xZtQ
-----END PGP SIGNATURE-----
--- End Message ---
__
This is the maintainer address of Debian's Java team
<https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-maintainers>.
Please use
[email protected] for discussions and questions.
