[Git][debian-gis-team/geos][experimental] 7 commits: New upstream version 3.8.0~beta1
Bas Couwenberg
gitlab at salsa.debian.org
Thu Oct 3 06:09:18 BST 2019
Bas Couwenberg pushed to branch experimental at Debian GIS Project / geos
Commits:
44ab7383 by Bas Couwenberg at 2019-09-28T05:29:43Z
New upstream version 3.8.0~beta1
- - - - -
9dfbea0c by Bas Couwenberg at 2019-09-30T16:59:29Z
Bump Standards-Version to 4.4.1, no changes.
- - - - -
773829e9 by Bas Couwenberg at 2019-10-03T04:35:14Z
New upstream version 3.8.0~rc1
- - - - -
91f0e970 by Bas Couwenberg at 2019-10-03T04:35:19Z
Update upstream source from tag 'upstream/3.8.0_rc1'
Update to upstream version '3.8.0~rc1'
with Debian dir 1b2bedf5ebb5fb42fb6dd38a7329a2f15332dcdb
- - - - -
2343b449 by Bas Couwenberg at 2019-10-03T04:35:34Z
New upstream release candidate.
- - - - -
3fe008b8 by Bas Couwenberg at 2019-10-03T04:56:18Z
Add patch to ignore OSX cruft.
- - - - -
112c4cdd by Bas Couwenberg at 2019-10-03T04:56:18Z
Set distribution to experimental.
- - - - -
14 changed files:
- ChangeLog
- Version.txt
- + capi/._geos_c.cpp
- capi/geos_c.h
- debian/changelog
- debian/control
- + debian/patches/check-local.patch
- debian/patches/series
- doc/Doxyfile
- + include/geos/io/._WKBWriter.h
- + include/geos/noding/._NodingIntersectionFinder.h
- + src/noding/._NodingIntersectionFinder.cpp
- swig/geos.i
- tests/unit/capi/GEOSVoronoiDiagramTest.cpp
Changes:
=====================================
ChangeLog
=====================================
@@ -1,3 +1,17 @@
+2019-10-01 Paul Ramsey <pramsey at cleverelephant.ca>
+
+ * tests/unit/capi/GEOSVoronoiDiagramTest.cpp: Add trimmed down test
+ case on Voronoi. Curiously, this case blows an exception on PostGIS,
+ but not in the unit test. References #859
+
+2019-09-27 Paul Ramsey <pramsey at cleverelephant.ca>
+
+ * HOWTO_RELEASE: Change directions for tag push
+
+2019-09-27 Paul Ramsey <pramsey at cleverelephant.ca>
+
+ * Version.txt: Bump versions
+
2019-09-27 Paul Ramsey <pramsey at cleverelephant.ca>
* HOWTO_RELEASE: Put tag step after verify step
=====================================
Version.txt
=====================================
@@ -5,7 +5,7 @@ GEOS_VERSION_MINOR=8
GEOS_VERSION_PATCH=0
# OPTIONS: "", "dev", "rc1" etc.
-GEOS_PATCH_WORD=beta1
+GEOS_PATCH_WORD=rc1
# GEOS CAPI Versions
#
@@ -14,9 +14,9 @@ GEOS_PATCH_WORD=beta1
# added, removed or changed.
# Increase the age value only if the changes made to the ABI
# are backward compatible.
-CAPI_INTERFACE_CURRENT=13
-CAPI_INTERFACE_REVISION=0
-CAPI_INTERFACE_AGE=12
+CAPI_INTERFACE_CURRENT=14
+CAPI_INTERFACE_REVISION=1
+CAPI_INTERFACE_AGE=13
# JTS Port
JTS_PORT=1.13.0
=====================================
capi/._geos_c.cpp
=====================================
Binary files /dev/null and b/capi/._geos_c.cpp differ
=====================================
capi/geos_c.h
=====================================
@@ -58,19 +58,19 @@ extern "C" {
#define GEOS_VERSION_MINOR 8
#endif
#ifndef GEOS_VERSION_PATCH
-#define GEOS_VERSION_PATCH 0beta1
+#define GEOS_VERSION_PATCH 0rc1
#endif
#ifndef GEOS_VERSION
-#define GEOS_VERSION "3.8.0beta1"
+#define GEOS_VERSION "3.8.0rc1"
#endif
#ifndef GEOS_JTS_PORT
#define GEOS_JTS_PORT "1.13.0"
#endif
#define GEOS_CAPI_VERSION_MAJOR 1
-#define GEOS_CAPI_VERSION_MINOR 12
-#define GEOS_CAPI_VERSION_PATCH 0
-#define GEOS_CAPI_VERSION "3.8.0beta1-CAPI-1.12.0"
+#define GEOS_CAPI_VERSION_MINOR 13
+#define GEOS_CAPI_VERSION_PATCH 1
+#define GEOS_CAPI_VERSION "3.8.0rc1-CAPI-1.13.1"
#define GEOS_CAPI_FIRST_INTERFACE GEOS_CAPI_VERSION_MAJOR
#define GEOS_CAPI_LAST_INTERFACE (GEOS_CAPI_VERSION_MAJOR+GEOS_CAPI_VERSION_MINOR)
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+geos (3.8.0~rc1-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Bump Standards-Version to 4.4.1, no changes.
+ * Add patch to ignore OSX cruft.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 03 Oct 2019 06:36:22 +0200
+
geos (3.8.0~beta1-1~exp1) experimental; urgency=medium
* New upstream beta release.
=====================================
debian/control
=====================================
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9.20160114),
pkg-kde-tools,
ruby-all-dev,
swig
-Standards-Version: 4.4.0
+Standards-Version: 4.4.1
Vcs-Browser: https://salsa.debian.org/debian-gis-team/geos
Vcs-Git: https://salsa.debian.org/debian-gis-team/geos.git -b experimental
Homepage: https://trac.osgeo.org/geos/
=====================================
debian/patches/check-local.patch
=====================================
@@ -0,0 +1,11 @@
+Description: Ignore OSX cruft.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -70,4 +70,5 @@ check-local:
+ ! find $(srcdir) -name '*.cpp' -o -name '*.h' | \
+ grep -v tests/xmltester/tinyxml | \
+ grep -v include/geos/algorithm/ttmath | \
++ grep -v '\._' | \
+ xargs grep -n '[[:space:]]$$'
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
libruby
+check-local.patch
=====================================
doc/Doxyfile
=====================================
@@ -38,7 +38,7 @@ PROJECT_NAME = GEOS
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 3.8.0beta1
+PROJECT_NUMBER = 3.8.0rc1
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
=====================================
include/geos/io/._WKBWriter.h
=====================================
Binary files /dev/null and b/include/geos/io/._WKBWriter.h differ
=====================================
include/geos/noding/._NodingIntersectionFinder.h
=====================================
Binary files /dev/null and b/include/geos/noding/._NodingIntersectionFinder.h differ
=====================================
src/noding/._NodingIntersectionFinder.cpp
=====================================
Binary files /dev/null and b/src/noding/._NodingIntersectionFinder.cpp differ
=====================================
swig/geos.i
=====================================
@@ -29,16 +29,16 @@
the whole c api. */
#define GEOS_VERSION_MAJOR 3
#define GEOS_VERSION_MINOR 8
-#define GEOS_VERSION_PATCH 0beta1
-#define GEOS_VERSION "3.8.0beta1"
+#define GEOS_VERSION_PATCH 0rc1
+#define GEOS_VERSION "3.8.0rc1"
#define GEOS_JTS_PORT "1.13.0"
#define GEOS_CAPI_VERSION_MAJOR 1
-#define GEOS_CAPI_VERSION_MINOR 12
-#define GEOS_CAPI_VERSION_PATCH 0
+#define GEOS_CAPI_VERSION_MINOR 13
+#define GEOS_CAPI_VERSION_PATCH 1
#define GEOS_CAPI_FIRST_INTERFACE GEOS_CAPI_VERSION_MAJOR
#define GEOS_CAPI_LAST_INTERFACE (GEOS_CAPI_VERSION_MAJOR+GEOS_CAPI_VERSION_MINOR)
-#define GEOS_CAPI_VERSION "3.8.0beta1-CAPI-1.12.0"
+#define GEOS_CAPI_VERSION "3.8.0rc1-CAPI-1.13.1"
/* Supported geometry types */
enum GEOSGeomTypes {
=====================================
tests/unit/capi/GEOSVoronoiDiagramTest.cpp
=====================================
@@ -183,5 +183,17 @@ void object::test<6>
"MULTILINESTRING ((-14 376.5882352941176, 172.3651328095773 261.4803591470258), (172.3651328095773 261.4803591470258, 56.63157894736844 73), (172.3651328095773 261.4803591470258, 200.6640625 265.6015625), (200.6640625 265.6015625, 201 265.4), (201 265.4, 210 251), (210 251, 210 73), (208.04 450, 200.6640625 265.6015625), (397 343.8, 201 265.4), (210 251, 397 176.2))"
);
}
+
+template<>
+template<>
+void object::test<7>
+()
+{
+ /* https://trac.osgeo.org/geos/ticket/859 */
+ std::string hex = "0104000020110F0000130000000101000000F06D31DFAA2E1B4131A0CD7FB94F604101010000000FE54E38B80E1B41C845F1FBB85260410101000000F06D31DFAA2E1B41CD873BECB854604101010000000FE54E38B80E1B4131A0CD7FB94F604101010000000FE54E38B80E1B410B4DECBCB94E604101010000000FE54E38B80E1B41452CADCDB85360410101000000F06D31DFAA2E1B41BAD5931AB950604101010000000FE54E38B80E1B417251B946BA4D604101010000000FE54E38B80E1B412209A9E2B85560410101000000F06D31DFAA2E1B41C845F1FBB85260410101000000F06D31DFAA2E1B41C2863DA9B95860410101000000F06D31DFAA2E1B413D7BF725B95660410101000000F06D31DFAA2E1B41E9C72241B95760410101000000F06D31DFAA2E1B4172D01602B951604101010000000FE54E38B80E1B4172D01602B951604101010000000FE54E38B80E1B41CD873BECB854604101010000000FE54E38B80E1B41BAD5931AB95060410101000000F06D31DFAA2E1B412209A9E2B85560410101000000F06D31DFAA2E1B41452CADCDB8536041";
+ geom1_ = GEOSGeomFromHEX_buf((const unsigned char*)(hex.c_str()), hex.length());
+ geom2_ = GEOSVoronoiDiagram(geom1_, nullptr, 0, 1);
+}
+
} // namespace tut
View it on GitLab: https://salsa.debian.org/debian-gis-team/geos/compare/29d40224d9ac9fe1defdfe04d727103e54d6fe32...112c4cdd2e7315e3b521ac2dd425f1f604f3b16a
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/geos/compare/29d40224d9ac9fe1defdfe04d727103e54d6fe32...112c4cdd2e7315e3b521ac2dd425f1f604f3b16a
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/20191003/0bbf34e4/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list