[Git][java-team/spatial4j-0.4][master] 5 commits: Add upstream patch to fix FTBFS
Sudip Mukherjee
gitlab at salsa.debian.org
Fri Nov 6 20:15:53 GMT 2020
Sudip Mukherjee pushed to branch master at Debian Java Maintainers / spatial4j-0.4
Commits:
cf6b9ed0 by Sudip Mukherjee at 2020-11-06T18:42:37+00:00
Add upstream patch to fix FTBFS
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee at gmail.com>
- - - - -
b5ed1ad5 by Sudip Mukherjee at 2020-11-06T18:55:40+00:00
Update Standards-Version to 4.5.0
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee at gmail.com>
- - - - -
7270e8f6 by Sudip Mukherjee at 2020-11-06T18:55:40+00:00
Use debhelper-compat and update compat level to 13
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee at gmail.com>
- - - - -
723075e9 by Sudip Mukherjee at 2020-11-06T18:55:40+00:00
Update Vcs to salsa
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee at gmail.com>
- - - - -
bc7ab12a by Sudip Mukherjee at 2020-11-06T20:07:58+00:00
Add changelog for 0.4.1-6 release
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee at gmail.com>
- - - - -
5 changed files:
- debian/changelog
- − debian/compat
- debian/control
- + debian/patches/carrotsearch_junit.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+spatial4j-0.4 (0.4.1-6) unstable; urgency=medium
+
+ * Team upload.
+ * Add upstream patch to fix FTBFS with updated carrotsearch-randomizedtesting.
+ * Update Standards-Version to 4.5.0
+ * Use debhelper-compat.
+ - Update compat level to 13.
+ * Update Vcs to salsa.
+
+ -- Sudip Mukherjee <sudipm.mukherjee at gmail.com> Fri, 06 Nov 2020 20:07:36 +0000
+
spatial4j-0.4 (0.4.1-5) unstable; urgency=medium
* Team upload.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -3,7 +3,7 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Hilko Bengen <bengen at debian.org>
-Build-Depends: debhelper (>= 11),
+Build-Depends: debhelper-compat (= 13),
default-jdk,
junit4,
libcarrotsearch-randomizedtesting-java,
@@ -12,9 +12,9 @@ Build-Depends: debhelper (>= 11),
libmaven-install-plugin-java,
libslf4j-java,
maven-debian-helper (>= 1.6.5)
-Standards-Version: 4.2.0
-Vcs-Git: git://anonscm.debian.org/pkg-java/spatial4j-0.4.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/spatial4j-0.4.git
+Standards-Version: 4.5.0
+Vcs-Git: https://salsa.debian.org/java-team/spatial4j-0.4.git
+Vcs-Browser: https://salsa.debian.org/java-team/spatial4j-0.4
Homepage: https://github.com/locationtech/spatial4j
Package: libspatial4j-0.4-java
=====================================
debian/patches/carrotsearch_junit.patch
=====================================
@@ -0,0 +1,199 @@
+Description: Fix FTBFS caused by update of carrotsearch-randomizedtesting
+
+upstream link: https://github.com/locationtech/spatial4j/commit/135c3b87cb32994b791585fcd95907f944d87fb6
+
+---
+
+--- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/distance/TestDistances.java
++++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/distance/TestDistances.java
+@@ -27,6 +27,8 @@ import com.spatial4j.core.shape.impl.Poi
+ import org.junit.Before;
+ import org.junit.Test;
+
++import static org.junit.Assert.assertEquals;
++import static org.junit.Assert.assertTrue;
+ import static com.spatial4j.core.distance.DistanceUtils.DEG_TO_KM;
+ import static com.spatial4j.core.distance.DistanceUtils.KM_TO_DEG;
+
+--- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/io/BinaryCodecTest.java
++++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/io/BinaryCodecTest.java
+@@ -31,6 +31,8 @@ import java.io.IOException;
+ import java.text.ParseException;
+ import java.util.Arrays;
+
++import static org.junit.Assert.assertEquals;
++
+ public class BinaryCodecTest extends RandomizedTest {
+
+ final SpatialContext ctx;
+--- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/io/JtsWKTReaderShapeParserTest.java
++++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/io/JtsWKTReaderShapeParserTest.java
+@@ -29,6 +29,10 @@ import org.junit.Test;
+
+ import java.io.IOException;
+
++import static org.junit.Assert.assertEquals;
++import static org.junit.Assert.assertTrue;
++import static org.junit.Assert.fail;
++
+ public class JtsWKTReaderShapeParserTest extends RandomizedTest {
+
+ final SpatialContext ctx;
+--- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java
++++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java
+@@ -32,6 +32,10 @@ import java.text.ParseException;
+ import java.util.Arrays;
+ import java.util.Collections;
+
++import static org.junit.Assert.assertEquals;
++import static org.junit.Assert.assertTrue;
++import static org.junit.Assert.fail;
++
+ public class JtsWktShapeParserTest extends WktShapeParserTest {
+
+ //By extending WktShapeParserTest we inherit its test too
+--- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/io/ShapeReadWriterTest.java
++++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/io/ShapeReadWriterTest.java
+@@ -27,6 +27,9 @@ import org.junit.Test;
+ import java.io.IOException;
+ import java.util.Arrays;
+
++import static org.junit.Assert.assertEquals;
++import static org.junit.Assert.assertFalse;
++import static org.junit.Assert.assertTrue;
+
+ @SuppressWarnings("unchecked")
+ public class ShapeReadWriterTest extends RandomizedTest {
+--- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/io/WktCustomShapeParserTest.java
++++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/io/WktCustomShapeParserTest.java
+@@ -25,6 +25,8 @@ import org.junit.Test;
+
+ import java.text.ParseException;
+
++import static org.junit.Assert.assertEquals;
++
+ public class WktCustomShapeParserTest extends WktShapeParserTest {
+
+ static class CustomShape extends PointImpl {
+--- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/io/WktShapeParserTest.java
++++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/io/WktShapeParserTest.java
+@@ -28,6 +28,10 @@ import java.text.ParseException;
+ import java.util.Arrays;
+ import java.util.Collections;
+
++import static org.junit.Assert.assertEquals;
++import static org.junit.Assert.assertNull;
++import static org.junit.Assert.fail;
++
+ public class WktShapeParserTest extends RandomizedTest {
+
+ final SpatialContext ctx;
+--- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/shape/AbstractTestShapes.java
++++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/shape/AbstractTestShapes.java
+@@ -26,6 +26,8 @@ import com.spatial4j.core.shape.impl.Rec
+ import org.junit.Rule;
+ import org.junit.Test;
+
++import static org.junit.Assert.assertEquals;
++import static org.junit.Assert.assertTrue;
+ import static com.spatial4j.core.shape.SpatialRelation.CONTAINS;
+ import static com.spatial4j.core.shape.SpatialRelation.DISJOINT;
+
+--- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/shape/BufferedLineTest.java
++++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/shape/BufferedLineTest.java
+@@ -32,6 +32,9 @@ import java.util.ArrayList;
+ import java.util.Collection;
+ import java.util.LinkedList;
+
++import static org.junit.Assert.assertFalse;
++import static org.junit.Assert.assertTrue;
++
+ public class BufferedLineTest extends RandomizedTest {
+
+ private final SpatialContext ctx = new SpatialContextFactory()
+@@ -181,4 +184,4 @@ public class BufferedLineTest extends Ra
+ }
+ }
+
+-}
+\ No newline at end of file
++}
+--- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java
++++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java
+@@ -37,6 +37,11 @@ import java.io.InputStreamReader;
+ import java.text.ParseException;
+ import java.util.Random;
+
++import static org.junit.Assert.assertEquals;
++import static org.junit.Assert.assertFalse;
++import static org.junit.Assert.assertNotNull;
++import static org.junit.Assert.assertTrue;
++import static org.junit.Assert.fail;
+ import static com.spatial4j.core.shape.SpatialRelation.CONTAINS;
+ import static com.spatial4j.core.shape.SpatialRelation.DISJOINT;
+ import static com.spatial4j.core.shape.SpatialRelation.INTERSECTS;
+--- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/shape/RandomizedShapeTest.java
++++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/shape/RandomizedShapeTest.java
+@@ -22,6 +22,9 @@ import com.spatial4j.core.context.Spatia
+ import com.spatial4j.core.distance.DistanceUtils;
+ import com.spatial4j.core.shape.impl.Range;
+
++import static org.junit.Assert.assertEquals;
++import static org.junit.Assert.assertTrue;
++import static org.junit.Assert.fail;
+ import static com.spatial4j.core.shape.SpatialRelation.CONTAINS;
+ import static com.spatial4j.core.shape.SpatialRelation.WITHIN;
+
+--- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/shape/RectIntersectionTestHelper.java
++++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/shape/RectIntersectionTestHelper.java
+@@ -22,6 +22,8 @@ import com.spatial4j.core.context.Spatia
+ import com.spatial4j.core.shape.impl.InfBufLine;
+ import com.spatial4j.core.shape.impl.PointImpl;
+
++import static org.junit.Assert.assertTrue;
++import static org.junit.Assert.fail;
+ import static com.spatial4j.core.shape.SpatialRelation.CONTAINS;
+ import static com.spatial4j.core.shape.SpatialRelation.DISJOINT;
+
+@@ -173,4 +175,4 @@ public abstract class RectIntersectionTe
+ return ctx.makeRectangle(minX, maxX, minY, maxY);
+ }
+
+-}
+\ No newline at end of file
++}
+--- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/shape/ShapeCollectionTest.java
++++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/shape/ShapeCollectionTest.java
+@@ -29,6 +29,8 @@ import java.util.ArrayList;
+ import java.util.Arrays;
+ import java.util.List;
+
++import static org.junit.Assert.assertEquals;
++import static org.junit.Assert.fail;
+ import static com.spatial4j.core.shape.SpatialRelation.CONTAINS;
+
+ /** @author David Smiley - dsmiley at mitre.org */
+--- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/shape/TestShapes2D.java
++++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/shape/TestShapes2D.java
+@@ -33,6 +33,9 @@ import java.util.ArrayList;
+ import java.util.Collections;
+ import java.util.List;
+
++import static org.junit.Assert.assertEquals;
++import static org.junit.Assert.assertFalse;
++import static org.junit.Assert.fail;
+ import static com.spatial4j.core.shape.SpatialRelation.CONTAINS;
+ import static com.spatial4j.core.shape.SpatialRelation.DISJOINT;
+ import static com.spatial4j.core.shape.SpatialRelation.INTERSECTS;
+--- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/shape/TestShapesGeo.java
++++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/shape/TestShapesGeo.java
+@@ -29,6 +29,9 @@ import org.junit.Test;
+
+ import java.util.Arrays;
+
++import static org.junit.Assert.assertEquals;
++import static org.junit.Assert.assertTrue;
++import static org.junit.Assert.fail;
+ import static com.spatial4j.core.shape.SpatialRelation.CONTAINS;
+ import static com.spatial4j.core.shape.SpatialRelation.DISJOINT;
+ import static com.spatial4j.core.shape.SpatialRelation.INTERSECTS;
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
jts-1.15.patch
+carrotsearch_junit.patch
View it on GitLab: https://salsa.debian.org/java-team/spatial4j-0.4/-/compare/1f5143f53c18230ada4b8e3538ac9d4e2e1d3601...bc7ab12a833c00d812a6efef6d4cf0864ce18b56
--
View it on GitLab: https://salsa.debian.org/java-team/spatial4j-0.4/-/compare/1f5143f53c18230ada4b8e3538ac9d4e2e1d3601...bc7ab12a833c00d812a6efef6d4cf0864ce18b56
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-java-commits/attachments/20201106/6f409aac/attachment.html>
More information about the pkg-java-commits
mailing list