Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ endif()
 #################################################################################
 # Set GEOS project
 #################################################################################
-project(GEOS VERSION 3.7.0 LANGUAGES C CXX)
+project(GEOS VERSION 3.7.2 LANGUAGES C CXX)
 # Add custom GEOS modules for CMake
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules")
@@ -58,7 +58,7 @@ message(STATUS "Setting GEOS version ${VERSION} as port of JTS ${JTS_PORT}")
 # GEOS C API version
 set(CAPI_INTERFACE_CURRENT 12)
-set(CAPI_INTERFACE_REVISION 0)
+set(CAPI_INTERFACE_REVISION 2)
 set(CAPI_INTERFACE_AGE 11)
 math(EXPR CAPI_VERSION_MAJOR "${CAPI_INTERFACE_CURRENT} - ${CAPI_INTERFACE_AGE}")

--- a/ChangeLog
+++ b/ChangeLog
+2019-05-02  Paul Ramsey <pramsey@cleverelephant.ca>
+	* NEWS: Set date for 3.7.2 release
+2019-02-04  Regina Obe <lr@pcorp.us>
+	* HOWTO_RELEASE, README.md: Update instructions to include updating
+	the readme.  Fix some old bot links
+2019-02-04  Regina Obe <lr@pcorp.us>
+	Merge branch '3.7' of https://git.osgeo.org/gitea/geos/geos into
+	3.7
+2019-02-04  Regina Obe <lr@pcorp.us>
+	* .drone-1.0.yml, README.md: Update badges to 3.7 (was stuck at
+	3.6), update drone to dronie (1.0 server)
+2019-01-28  Paul Ramsey <pramsey@cleverelephant.ca>
+	* NEWS, src/noding/SingleInteriorIntersectionFinder.cpp,
+	tests/xmltester/CMakeLists.txt, tests/xmltester/Makefile.am,
+	tests/xmltester/tests/ticket/bug838.xml: Invalid union result from
+	valid polygon inputs References #838
+2019-01-28  Paul Ramsey <pramsey@cleverelephant.ca>
+	* NEWS, src/operation/overlay/PolygonBuilder.cpp,
+	tests/xmltester/tests/general/TestFunctionAA.xml: Polygon build
+	failure in Overlay difference References #789
+2019-01-28  Paul Ramsey <pramsey@cleverelephant.ca>
+	* NEWS, capi/CMakeLists.txt, src/CMakeLists.txt: fail with cmake
+	-DGEOS_ENABLE_MACOSX_FRAMEWORK=NO Closes #936
+2019-01-25  Paul Ramsey <pramsey@cleverelephant.ca>
+	* src/geom/Envelope.cpp: Convert from nullptr to NULL
+2019-01-25  Paul Ramsey <pramsey@cleverelephant.ca>
+	* NEWS: Update news
+2019-01-25  Paul Ramsey <pramsey@cleverelephant.ca>
+	* src/geom/Envelope.cpp: Change Envelope constructor to use strtod
+	References #875
+2018-12-21  Regina Obe <lr@pcorp.us>
+	Merge branch '3.7' of https://git.osgeo.org/gitea/geos/geos into
+	3.7
+2018-12-20  Paul Ramsey <pramsey@cleverelephant.ca>
+	* CMakeLists.txt: Remove 'dev' suffix from patch number
+2018-12-20  Regina Obe <regina.obe@appsassociates.com>
+	* configure.ac: Change version to 3.7.2dev from 3.7.2
+2018-12-08  Regina Obe <lr@pcorp.us>
+	* CMakeLists.txt, include/geos/version.h.vc: More version number
+	updates
+2018-12-08  Regina Obe <lr@pcorp.us>
+	* CMakeLists.txt, capi/geos_c.h.in: Increment to GEOS 3.7.2
+2018-11-29  Paul Ramsey <pramsey@cleverelephant.ca>
+	* NEWS, configure.ac: Bump versions for next dev cycle
 2018-11-29  Paul Ramsey <pramsey@cleverelephant.ca>
 	* NEWS, configure.ac: News and version bump for 3.7.1
--- a/NEWS
+++ b/NEWS
+Changes in 3.7.2
+2019-05-02
+- Bug fixes / improvements
+  - Envelope constructor using strtod (#875 Paul Ramsey)
+  - Failure in CMake for OSX Framework (#936 Paul Ramsey)
+  - Polygon build failure in Overlay difference (#789 Paul Ramsey)
+  - Invalid union result from valid polygon inputs (#838)
 Changes in 3.7.1
 2018-11-29

--- a/README.md
+++ b/README.md
@@ -7,8 +7,8 @@ Project homepage: http://geos.osgeo.org/
 | branch / CI | Debbie | Winnie | Dronie | Travis CI | GitLab CI | AppVeyor | Bessie | Bessie32 |
 |:---         |:---    |:---    |:---    |:---       |:---       |:---      |:---    |:---    |
-| master      | [![debbie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Master)](https://debbie.postgis.net/view/GEOS/job/GEOS_Master/) | [![winnie](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Master/badge/icon)](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Master/) | [![dronie](https://drone.osgeo.org/api/badges/geos/geos/status.svg?branch=master)](https://drone.osgeo.org/geos/geos?branch=master) | [![travis](https://travis-ci.com/libgeos/geos.svg?branch=master)](https://travis-ci.com/libgeos/geos?branch=master) | [![gitlab-ci](https://gitlab.com/geos/libgeos/badges/master/build.svg)](https://gitlab.com/geos/libgeos/commits/master) | [![appveyor](https://ci.appveyor.com/api/projects/status/ao909hwpsb1yu062/branch/master?svg=true)](https://ci.appveyor.com/project/OSGeo/geos/branch/master) | [![bessie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie&BRANCH=master)](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie) | [![bessie32](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie32&BRANCH=master)](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie32) ||
+| 3.7      | [![debbie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_3.7)](https://debbie.postgis.net/view/GEOS/job/GEOS_3.7/) | [![winnie](https://winnie.postgis.net:444/view/GEOS/job/GEOS_3.7/badge/icon)](https://winnie.postgis.net:444/view/GEOS/job/GEOS_3.7/) | [![dronie](https://dronie.osgeo.org/api/badges/geos/geos/status.svg?ref=refs/heads/3.7)](https://drone.osgeo.org/geos/geos?branch=3.7) | [![travis](https://travis-ci.com/libgeos/geos.svg?branch=3.7)](https://travis-ci.com/libgeos/geos?branch=3.7) | [![gitlab-ci](https://gitlab.com/geos/libgeos/badges/3.7/build.svg)](https://gitlab.com/geos/libgeos/commits/3.7) | [![appveyor](https://ci.appveyor.com/api/projects/status/ao909hwpsb1yu062/branch/3.7?svg=true)](https://ci.appveyor.com/project/OSGeo/geos/branch/3.7) | [![bessie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie&BRANCH=3.7)](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie) | [![bessie32](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie32&BRANCH=3.7)](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie32) ||
-| svn-3.6     | [![debbie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Branch_3.6)](https://debbie.postgis.net/view/GEOS/job/GEOS_Branch_3.6/) | [![winnie](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.6/badge/icon)](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.6/) | [![dronie](https://drone.osgeo.org/api/badges/geos/geos/status.svg?branch=svn-3.6)](https://drone.osgeo.org/geos/geos?branch=svn-3.6) | [![travis](https://travis-ci.com/libgeos/geos.svg?branch=svn-3.6)](https://travis-ci.com/libgeos/geos?branch=svn-3.6) | [![gitlab-ci](https://gitlab.com/geos/libgeos/badges/svn-3.6/build.svg)](https://gitlab.com/geos/libgeos/commits/svn-3.6) | [![appveyor](https://ci.appveyor.com/api/projects/status/ao909hwpsb1yu062/branch/svn-3.6?svg=true)](https://ci.appveyor.com/project/OSGeo/geos/branch/svn-3.6) |
+| 3.7     | [![debbie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Branch_3.7)](https://debbie.postgis.net/view/GEOS/job/GEOS_Branch_3.7/) | [![winnie](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.7/badge/icon)](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.7/) | [![dronie](https://dronie.osgeo.org/api/badges/geos/geos/status.svg?ref=refs/heads/3.7)](https://dronie.osgeo.org/geos/geos?branch=3.7) | [![travis](https://travis-ci.com/libgeos/geos.svg?branch=3.7)](https://travis-ci.com/libgeos/geos?branch=3.7) | [![gitlab-ci](https://gitlab.com/geos/libgeos/badges/3.7/build.svg)](https://gitlab.com/geos/libgeos/commits/3.7) | [![appveyor](https://ci.appveyor.com/api/projects/status/ao909hwpsb1yu062/branch/3.7?svg=true)](https://ci.appveyor.com/project/OSGeo/geos/branch/3.7) |
 More on: https://trac.osgeo.org/geos#BuildandInstall
@@ -105,7 +105,7 @@ when configuring:
    ./configure ... --enable-ruby
-Since version 3.6.0 PHP bindings are not included in the core
+Since version 3.7.0 PHP bindings are not included in the core
 library anymore but available as a separate project:
    https://git.osgeo.org/gogs/geos/php-geos

--- a/aclocal.m4
+++ b/aclocal.m4
@@ -20,6 +20,44 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
+# ===========================================================================
+#    https://www.gnu.org/software/autoconf-archive/ax_require_defined.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_REQUIRE_DEFINED(MACRO)
+#
+# DESCRIPTION
+#
+#   AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
+#   been defined and thus are available for use.  This avoids random issues
+#   where a macro isn't expanded.  Instead the configure script emits a
+#   non-fatal:
+#
+#     ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
+#
+#   It's like AC_REQUIRE except it doesn't expand the required macro.
+#
+#   Here's an example:
+#
+#     AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
+#
+# LICENSE
+#
+#   Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+#serial 2
+AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
+  m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
+])dnl AX_REQUIRE_DEFINED
 # Copyright (C) 2002-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation

--- a/capi/CMakeLists.txt
+++ b/capi/CMakeLists.txt
@@ -40,9 +40,10 @@ if(NOT GEOS_ENABLE_MACOSX_FRAMEWORK AND GEOS_BUILD_SHARED)
      CLEAN_DIRECT_OUTPUT 1)
  endif()
+  add_dependencies(geos_c geos_revision)
 endif()
-add_dependencies(geos_c geos_revision)
 #################################################################################
 # Installation

--- a/capi/geos_c.h
+++ b/capi/geos_c.h
@@ -61,7 +61,7 @@ extern "C" {
 #define GEOS_CAPI_VERSION_MAJOR 1
 #define GEOS_CAPI_VERSION_MINOR 11
 #define GEOS_CAPI_VERSION_PATCH 0
-#define GEOS_CAPI_VERSION "3.7.0-CAPI-1.11.0"
+#define GEOS_CAPI_VERSION "3.7.2-CAPI-1.11.0"
 #else
 #ifndef GEOS_VERSION_MAJOR
 #define GEOS_VERSION_MAJOR 3
@@ -70,10 +70,10 @@ extern "C" {
 #define GEOS_VERSION_MINOR 7
 #endif
 #ifndef GEOS_VERSION_PATCH
-#define GEOS_VERSION_PATCH 1
+#define GEOS_VERSION_PATCH 2
 #endif
 #ifndef GEOS_VERSION
-#define GEOS_VERSION "3.7.1"
+#define GEOS_VERSION "3.7.2"
 #endif
 #ifndef GEOS_JTS_PORT
 #define GEOS_JTS_PORT "1.13.0"
@@ -81,8 +81,8 @@ extern "C" {
 #define GEOS_CAPI_VERSION_MAJOR 1
 #define GEOS_CAPI_VERSION_MINOR 11
-#define GEOS_CAPI_VERSION_PATCH 1
+#define GEOS_CAPI_VERSION_PATCH 2
-#define GEOS_CAPI_VERSION "3.7.1-CAPI-1.11.1"
+#define GEOS_CAPI_VERSION "3.7.2-CAPI-1.11.2"
 #endif
 #define GEOS_CAPI_FIRST_INTERFACE GEOS_CAPI_VERSION_MAJOR

--- a/capi/geos_c.h.in
+++ b/capi/geos_c.h.in
@@ -61,7 +61,7 @@ extern "C" {
 #define GEOS_CAPI_VERSION_MAJOR 1
 #define GEOS_CAPI_VERSION_MINOR 11
 #define GEOS_CAPI_VERSION_PATCH 0
-#define GEOS_CAPI_VERSION "3.7.0-CAPI-1.11.0"
+#define GEOS_CAPI_VERSION "3.7.2-CAPI-1.11.0"
 #else
 #ifndef GEOS_VERSION_MAJOR
 #define GEOS_VERSION_MAJOR @VERSION_MAJOR@

--- a/configure
+++ b/configure
@@ -2615,12 +2615,12 @@ test -n "$target_alias" &&
 JTS_PORT=1.13.0
 CAPI_INTERFACE_CURRENT=12
-CAPI_INTERFACE_REVISION=1
+CAPI_INTERFACE_REVISION=2
 CAPI_INTERFACE_AGE=11
 VERSION_MAJOR=3
 VERSION_MINOR=7
-VERSION_PATCH=1
+VERSION_PATCH=2
 VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
 VERSION_RELEASE=`echo "$VERSION" | sed -E 's/^([0-9]+\.[0-9]+\.[0-9]+).*$/\1/'`

--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ JTS_PORT=1.13.0
 dnl -- Version info for the CAPI
 CAPI_INTERFACE_CURRENT=12
-CAPI_INTERFACE_REVISION=1
+CAPI_INTERFACE_REVISION=2
 CAPI_INTERFACE_AGE=11
 dnl
@@ -24,7 +24,7 @@ dnl -- encoding ABI break at every release
 dnl
 VERSION_MAJOR=3
 VERSION_MINOR=7
-VERSION_PATCH=1
+VERSION_PATCH=2
 VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
 VERSION_RELEASE=`echo "$VERSION" | sed -E 's/^([[0-9]+\.[0-9]+\.[0-9]+]).*$/\1/'`

--- a/debian/changelog
+++ b/debian/changelog
-geos (3.7.1-2) UNRELEASED; urgency=medium
+geos (3.7.2-1) unstable; urgency=medium
+  * Update gbp.conf to use --source-only-changes by default.
+  * Bump Standards-Version to 4.4.0, no changes.
+  * Add copyright holders for debian/*.
+  * Update symbols for other architectures.
+  * Move from experimental to unstable.
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 23 Jul 2019 07:12:24 +0200
+geos (3.7.2-1~exp1) experimental; urgency=medium
+  * New upstream release.
  * Bump Standards-Version to 4.3.0, no changes.
+  * Rename library package for SONAME bump.
+  * Update symbols for amd64.
- -- Bas Couwenberg <sebastic@debian.org>  Tue, 25 Dec 2018 22:19:48 +0100
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 03 May 2019 06:10:50 +0200
 geos (3.7.1-1) unstable; urgency=medium

--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9.20160114),
               pkg-kde-tools,
               ruby-all-dev,
               swig
-Standards-Version: 4.3.0
+Standards-Version: 4.4.0
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/geos
 Vcs-Git: https://salsa.debian.org/debian-gis-team/geos.git
 Homepage: https://trac.osgeo.org/geos/
@@ -32,7 +32,7 @@ Description: Geometry engine for GIS - Development files
 Package: libgeos++-dev
 Architecture: any
 Section: libdevel
-Depends: libgeos-3.7.1 (= ${binary:Version}),
+Depends: libgeos-3.7.2 (= ${binary:Version}),
         libgeos-dev,
         ${misc:Depends}
 Suggests: libgdal-doc
@@ -72,7 +72,7 @@ Description: Geometry engine for Geographic Information Systems - C Library
 This package contains the C library. A C++ library is provided
 by the libgeos-* package.
-Package: libgeos-3.7.1
+Package: libgeos-3.7.2
 Architecture: any
 Multi-Arch: same
 Section: libs

--- a/debian/copyright
+++ b/debian/copyright
@@ -36,6 +36,17 @@ License: public-domain
 All code here is considered in the public domain though I do wish
 my name could be retained if anyone uses them. :-)
+Files: debian/*
+Copyright: Steve Halasz <debian@adkgis.org>
+           Alan Boudreault <aboudreault@mapgears.com>
+           Bas Couwenberg <sebastic@debian.org>
+           Fabio Tranchitella <kobold@debian.org>
+           Francesco Paolo Lovergine <frankie@debian.org>
+           Jerome Villeneuve Larouche <jlarouche@mapgears.com>
+           Markus Wanner <markus@bluegap.ch>
+           Paul Wise <pabs@debian.org>
+License: LGPL-2.1+
 License: LGPL-2.1+
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -14,3 +14,6 @@ upstream-tag = upstream/%(version)s
 # Always use pristine-tar.
 pristine-tar = True
+[buildpackage]
+pbuilder-options = --source-only-changes
--- a/debian/libgeos-3.7.1.dirs
+++ b/debian/libgeos-3.7.1.dirs
-usr/lib
--- a/debian/libgeos-3.7.1.install
+++ b/debian/libgeos-3.7.1.install
--- a/debian/libgeos-3.7.1.symbols
+++ b/debian/libgeos-3.7.1.symbols
--- a/debian/libgeos-c1v5.symbols
+++ b/debian/libgeos-c1v5.symbols
-# SymbolsHelper-Confirmed: 3.7.1 amd64 hppa i386 m68k powerpc powerpcspe sh4
+# SymbolsHelper-Confirmed: 3.7.2 amd64 arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k ppc64el riscv64 s390x sh4 x32
 libgeos_c.so.1 #PACKAGE# #MINVER#
 * Build-Depends-Package: libgeos-dev
 GEOSArea@Base 3.4.2
@@ -435,8 +435,7 @@ libgeos_c.so.1 #PACKAGE# #MINVER#
 _ZNK4geos4geom8Geometry7getSRIDEv@Base 3.4.2
 _ZNSt6vectorIPKN4geos4geom10CoordinateESaIS4_EE17_M_realloc_insertIJRKS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 3.7.0
 _ZNSt6vectorIPN4geos4geom8GeometryESaIS3_EE12emplace_backIJS3_EEEvDpOT_@Base 3.7.0
- (optional=templinst)_ZNSt6vectorIPN4geos4geom8GeometryESaIS3_EE7reserveEj@Base 3.7.1
+ (optional=templinst|subst)_ZNSt6vectorIPN4geos4geom8GeometryESaIS3_EE7reserveE{size_t}@Base 3.7.1
- (optional=templinst|arch=amd64)_ZNSt6vectorIPN4geos4geom8GeometryESaIS3_EE7reserveEm@Base 3.7.1
 (optional=templinst)_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPKcEEvT_S8_St20forward_iterator_tag@Base 3.7.0
 (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev@Base 3.4.2
 (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base 3.4.2

--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -23,7 +23,7 @@ PROJECT_NAME           =  GEOS
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
-PROJECT_NUMBER         = 3.7.1
+PROJECT_NUMBER         = 3.7.2
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
@@ -308,7 +308,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
-INPUT                  =  ./../src ./../include ./../capi
+INPUT                  =  ../../geos-git/doc/../src ../../geos-git/doc/../include ../../geos-git/doc/../capi
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 

--- a/geos_revision.h
+++ b/geos_revision.h
-#define GEOS_REVISION "27a5e771"
+#define GEOS_REVISION "b55d2125"