Makefile.am

@@ -28,7 +28,8 @@ EXTRA_DIST = acsite.m4 makefile.vc nmake.opt autogen.bat CMakeLists.txt \
   cmake/modules/CheckPrototypeExists.cmake \
   cmake/modules/COPYING-CMAKE-SCRIPTS \
   cmake/modules/GenerateSourceGroups.cmake \
-  cmake/cmake_uninstall.cmake.in geos_revision.h
+  cmake/cmake_uninstall.cmake.in geos_revision.h \
+  README.md
 
 ACLOCAL_AMFLAGS = -I macros
 
@@ -38,7 +39,7 @@ gen-ChangeLog:
 	cd $(distdir) && owd=`pwd` && \
   cd ../ && cd $(srcdir) && \
 	if test -d .git; then \
-		git2cl > $${owd}/ChangeLog; \
+		git log --pretty --numstat --summary | git2cl > $${owd}/ChangeLog; \
 	elif test -d .svn; then \
 		svn2cl --authors=authors.svn -i -o $${owd}/ChangeLog; \
 	elif test -f ChangeLog; then \
@@ -66,5 +67,5 @@ valgrindcheck:
 
 check-local:
 	! find . -name '*.cpp' -o -name '*.h' | \
-		grep -v ^./tests/xmltester/tinyxml | \
+		grep -v tests/xmltester/tinyxml | \
 		xargs grep -n '[[:space:]]$$'

Makefile.in

@@ -314,6 +314,8 @@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RUBY = @RUBY@
+RUBY_ARCH_INCLUDE_DIR = @RUBY_ARCH_INCLUDE_DIR@
+RUBY_ARCH_LIB_DIR = @RUBY_ARCH_LIB_DIR@
 RUBY_BIN_DIR = @RUBY_BIN_DIR@
 RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
 RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
@@ -334,6 +336,7 @@ VERSION = @VERSION@
 VERSION_MAJOR = @VERSION_MAJOR@
 VERSION_MINOR = @VERSION_MINOR@
 VERSION_PATCH = @VERSION_PATCH@
+VERSION_RELEASE = @VERSION_RELEASE@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -415,7 +418,8 @@ EXTRA_DIST = acsite.m4 makefile.vc nmake.opt autogen.bat CMakeLists.txt \
   cmake/modules/CheckPrototypeExists.cmake \
   cmake/modules/COPYING-CMAKE-SCRIPTS \
   cmake/modules/GenerateSourceGroups.cmake \
-  cmake/cmake_uninstall.cmake.in geos_revision.h
+  cmake/cmake_uninstall.cmake.in geos_revision.h \
+  README.md
 
 ACLOCAL_AMFLAGS = -I macros
 VALGRIND = $(LIBTOOL) --mode=execute valgrind --leak-check=full --error-exitcode=1
@@ -901,7 +905,7 @@ gen-ChangeLog:
 	cd $(distdir) && owd=`pwd` && \
   cd ../ && cd $(srcdir) && \
 	if test -d .git; then \
-		git2cl > $${owd}/ChangeLog; \
+		git log --pretty --numstat --summary | git2cl > $${owd}/ChangeLog; \
 	elif test -d .svn; then \
 		svn2cl --authors=authors.svn -i -o $${owd}/ChangeLog; \
 	elif test -f ChangeLog; then \
@@ -927,7 +931,7 @@ valgrindcheck:
 
 check-local:
 	! find . -name '*.cpp' -o -name '*.h' | \
-		grep -v ^./tests/xmltester/tinyxml | \
+		grep -v tests/xmltester/tinyxml | \
 		xargs grep -n '[[:space:]]$$'
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

NEWS

-Changes in 3.7.0alpha
-2018-06-DD
+Changes in 3.7.0beta1
+2018-06-25
 
 - New things:
   - CAPI: GEOSDistanceIndexed (#795, Dan Baston)
@@ -8,11 +8,27 @@ Changes in 3.7.0alpha
           GEOSGeom_getYMin, GEOSGeom_getYMax (#871, Dan Baston)
   - CAPI: GEOSFrechetDistance (#797, Shinichi SUGIYAMA)
   - CAPI: GEOSReverse (#872, Dan Baston)
+  - CAPI: GEOSGeomGetZ (#581, J Smith)
+
 - Improvements
   - Interruptible snap operation (Paul Ramsey)
+  - Numerous packaging, doc, and build changes
+    (Debian group: Bas Couwenberg, Francesco Paolo Lovergine)
+
 - C++ API changes:
   - Require defining USE_UNSTABLE_GEOS_CPP_API for use without
     warnings.
+  - Make C++11 required (Mateusz Loskot)
+  - Use C++11 unique_ptr, nullptr, and override constructs
+    (Mateusz Loskot)
+  - C++11 standard delete on noncopyable
+    (#851, Vicky Vergara)
+  - Fix CommonBits::getBit to correctly handle i >= 32
+    (#834, Kurt Schwehr)
+
+Changes in 3.7.0alpha
+2018-06-14
+See 3.7.0 notes
 
 Changes in 3.6.1
 2016-12-24

README.md

+GEOS -- Geometry Engine, Open Source
+====================================
+
+Project homepage: http://geos.osgeo.org/
+
+## Build status
+
+| 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) ||
+| 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) |
+
+More on: https://trac.osgeo.org/geos#BuildandInstall
+
+## Building, testing, installing
+
+### Unix
+
+Using Autotools:
+
+    ./autogen.sh  # in ${srcdir}, if obtained from SVN or GIT
+    ${srcdir}/configure # in build dir
+
+Using CMake:
+
+    cmake ${srcdir} # in build dir
+
+Now, all versions:
+
+    make
+    make check
+    make install # as root
+    ldconfig # as root
+
+
+### Microsoft Windows
+
+If you use Microsoft Visual C++ (7.1 or later) compiler, you can build
+GEOS using NMAKE program and provided `makefile.vc` files.
+
+If you are building from SVN or GIT checkout, first run: `autogen.bat`
+Then:
+
+    nmake /f makefile.vc MSVC_VER=1400
+
+where 1400 is version number of Visual C++ compiler, here Visual C++ 8.0
+from Visual Studio 2005 (supported versions are 1300, 1310, 1400, 1500,
+1600, 1700, 1800 and 1900).
+The bootstrap.bat step is required to generate a couple of header files.
+
+In order to build debug configuration of GEOS, additional flag `DEBUG=1`
+is required:
+
+    nmake /f makefile.vc MSVC_VER=1400 DEBUG=1
+
+
+## Client applications
+
+### Using the C interface (recommended)
+
+GEOS promises long term stability of C API
+
+The C library uses the C++ interface, but the C library follows
+normal ABI-change-sensitive versioning, so programs that link only
+against the C library should work without relinking when GEOS is upgraded.
+
+To compile programs against the C lib (recommended):
+
+    CFLAGS += `geos-config --cflags`
+    LDFLAGS += `geos-config --ldflags` -lgeos_c
+    #include <geos_c.h>
+
+Example usage:
+
+    capi/geostest.c contains basic usage examples.
+
+### Using the C++ interface (no stability promise)
+
+Developers who decide to use the C++ interface should be aware GEOS
+does not promise API or ABI stability of C++ API between releases.
+Moreover C++ API/ABI breaking changes may not even be announced
+or include in the NEWS file
+
+The C++ library name will change on every minor release because
+it is too hard to know if there have been ABI changes.
+
+To compile programs against the C++ lib:
+
+    CFLAGS += `geos-config --cflags`
+    LDFLAGS += `geos-config --ldflags` -lgeos
+    #include <geos.h>
+
+Basic usage examples can be found in `doc/example.cpp`.
+
+
+### Scripting language bindings
+
+Ruby bindings are fully supported. To build, use the `--enable-ruby` option
+when configuring:
+
+    ./configure ... --enable-ruby
+
+Since version 3.6.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
+
+Since version 3.0, the Python bindings are unsupported. Recommended options:
+
+ 1. Become or recruit a new maintainer.
+ 2. Use [Shapely](http://pypi.python.org/pypi/Shapely) with Python
+    versions 2.4 or greater.
+ 3. Simply call functions from `libgeos_c` via Python ctypes.
+
+## Documentation
+
+To build Doxygen documentation:
+
+    cd doc
+    make doxygen-html
+

capi/Makefile.in

@@ -306,6 +306,8 @@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RUBY = @RUBY@
+RUBY_ARCH_INCLUDE_DIR = @RUBY_ARCH_INCLUDE_DIR@
+RUBY_ARCH_LIB_DIR = @RUBY_ARCH_LIB_DIR@
 RUBY_BIN_DIR = @RUBY_BIN_DIR@
 RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
 RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
@@ -326,6 +328,7 @@ VERSION = @VERSION@
 VERSION_MAJOR = @VERSION_MAJOR@
 VERSION_MINOR = @VERSION_MINOR@
 VERSION_PATCH = @VERSION_PATCH@
+VERSION_RELEASE = @VERSION_RELEASE@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

capi/geos_c.cpp

@@ -665,6 +665,16 @@ GEOSGeomGetY(const Geometry *g, double *y)
 	return GEOSGeomGetY_r(handle, g, y);
 }
 
+/*
+ * For POINT
+ * returns 0 on exception, otherwise 1
+ */
+int
+GEOSGeomGetZ(const Geometry *g1, double *z)
+{
+	return GEOSGeomGetZ_r(handle, g1, z);
+}
+
 /*
  * Call only on polygon
  * Return a copy of the internal Geometry.

capi/geos_c.h

@@ -70,10 +70,10 @@ extern "C" {
 #define GEOS_VERSION_MINOR 7
 #endif
 #ifndef GEOS_VERSION_PATCH
-#define GEOS_VERSION_PATCH 0alpha
+#define GEOS_VERSION_PATCH 0beta1
 #endif
 #ifndef GEOS_VERSION
-#define GEOS_VERSION "3.7.0alpha"
+#define GEOS_VERSION "3.7.0beta1"
 #endif
 #ifndef GEOS_JTS_PORT
 #define GEOS_JTS_PORT "1.13.0"
@@ -82,7 +82,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.0alpha-CAPI-1.11.0"
+#define GEOS_CAPI_VERSION "3.7.0beta1-CAPI-1.11.0"
 #endif
 
 #define GEOS_CAPI_FIRST_INTERFACE GEOS_CAPI_VERSION_MAJOR
@@ -1069,6 +1069,7 @@ extern int GEOS_DLL GEOSGeomGetNumPoints_r(GEOSContextHandle_t handle,
 /* Return -1 on exception, Geometry must be a Point. */
 extern int GEOS_DLL GEOSGeomGetX_r(GEOSContextHandle_t handle, const GEOSGeometry *g, double *x);
 extern int GEOS_DLL GEOSGeomGetY_r(GEOSContextHandle_t handle, const GEOSGeometry *g, double *y);
+extern int GEOS_DLL GEOSGeomGetZ_r(GEOSContextHandle_t handle, const GEOSGeometry *g, double *z);
 
 /*
  * Return NULL on exception, Geometry must be a Polygon.
@@ -1993,6 +1994,7 @@ extern int GEOS_DLL GEOSGeomGetNumPoints(const GEOSGeometry* g);
 /* Return -1 on exception, Geometry must be a Point. */
 extern int GEOS_DLL GEOSGeomGetX(const GEOSGeometry *g, double *x);
 extern int GEOS_DLL GEOSGeomGetY(const GEOSGeometry *g, double *y);
+extern int GEOS_DLL GEOSGeomGetZ(const GEOSGeometry *g, double *z);
 
 /*
  * Return NULL on exception, Geometry must be a Polygon.

capi/geos_c.h.in

@@ -1069,6 +1069,7 @@ extern int GEOS_DLL GEOSGeomGetNumPoints_r(GEOSContextHandle_t handle,
 /* Return -1 on exception, Geometry must be a Point. */
 extern int GEOS_DLL GEOSGeomGetX_r(GEOSContextHandle_t handle, const GEOSGeometry *g, double *x);
 extern int GEOS_DLL GEOSGeomGetY_r(GEOSContextHandle_t handle, const GEOSGeometry *g, double *y);
+extern int GEOS_DLL GEOSGeomGetZ_r(GEOSContextHandle_t handle, const GEOSGeometry *g, double *z);
 
 /*
  * Return NULL on exception, Geometry must be a Polygon.
@@ -1993,6 +1994,7 @@ extern int GEOS_DLL GEOSGeomGetNumPoints(const GEOSGeometry* g);
 /* Return -1 on exception, Geometry must be a Point. */
 extern int GEOS_DLL GEOSGeomGetX(const GEOSGeometry *g, double *x);
 extern int GEOS_DLL GEOSGeomGetY(const GEOSGeometry *g, double *y);
+extern int GEOS_DLL GEOSGeomGetZ(const GEOSGeometry *g, double *z);
 
 /*
  * Return NULL on exception, Geometry must be a Polygon.

capi/geos_ts_c.cpp

@@ -3198,6 +3198,49 @@ GEOSGeomGetY_r(GEOSContextHandle_t extHandle, const Geometry *g1, double *y)
     return 0;
 }
 
+/*
+ * For POINT
+ * returns 0 on exception, otherwise 1
+ */
+int
+GEOSGeomGetZ_r(GEOSContextHandle_t extHandle, const Geometry *g1, double *z)
+{
+    if ( 0 == extHandle )
+    {
+        return 0;
+    }
+
+    GEOSContextHandleInternal_t *handle = 0;
+    handle = reinterpret_cast<GEOSContextHandleInternal_t*>(extHandle);
+    if ( 0 == handle->initialized )
+    {
+        return 0;
+    }
+
+    try
+    {
+        using geos::geom::Point;
+        const Point *po = dynamic_cast<const Point *>(g1);
+        if ( ! po )
+        {
+            handle->ERROR_MESSAGE("Argument is not a Point");
+            return 0;
+        }
+        *z = po->getZ();
+        return 1;
+    }
+    catch (const std::exception &e)
+    {
+        handle->ERROR_MESSAGE("%s", e.what());
+    }
+    catch (...)
+    {
+        handle->ERROR_MESSAGE("Unknown exception thrown");
+    }
+
+    return 0;
+}
+
 /*
  * Call only on polygon
  * Return a copy of the internal Geometry.
@@ -7128,7 +7171,7 @@ GEOSVoronoiDiagram_r(GEOSContextHandle_t extHandle, const Geometry *g1, const Ge
 	}
 	catch(...)
 	{
-		handle->ERROR_MESSAGE("Unknow exception thrown");
+		handle->ERROR_MESSAGE("Unknown exception thrown");
 	}
 
 	return NULL;

configure

@@ -643,6 +643,7 @@ JTS_PORT
 INTERFACE_AGE
 INTERFACE_REVISION
 INTERFACE_CURRENT
+VERSION_RELEASE
 VERSION_PATCH
 VERSION_MINOR
 VERSION_MAJOR
@@ -651,7 +652,9 @@ ENABLE_RUBY_TRUE
 RUBY_SHARED_LIB
 RUBY_SO_NAME
 RUBY_EXTENSION_DIR
+RUBY_ARCH_LIB_DIR
 RUBY_LIB_DIR
+RUBY_ARCH_INCLUDE_DIR
 RUBY_INCLUDE_DIR
 RUBY_SITE_ARCH
 RUBY_BIN_DIR
@@ -2629,8 +2632,9 @@ CAPI_INTERFACE_AGE=11
 VERSION_MAJOR=3
 VERSION_MINOR=7
-VERSION_PATCH=0alpha
+VERSION_PATCH=0beta1
 VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
+VERSION_RELEASE=`echo "$VERSION" | sed -E 's/^([0-9]+\.[0-9]+\.[0-9]+).*?$/\1/'`
 CAPI_VERSION_MAJOR=`expr $CAPI_INTERFACE_CURRENT - $CAPI_INTERFACE_AGE`
 CAPI_VERSION_MINOR=$CAPI_INTERFACE_AGE
@@ -19362,8 +19366,12 @@ fi
 				RUBY_INCLUDE_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["rubyhdrdir"] || Config::CONFIG["archdir"]'`
+				RUBY_ARCH_INCLUDE_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["rubyarchhdrdir"] || Config::CONFIG["archdir"]'`
+
 				RUBY_LIB_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["libdir"] || Config::CONFIG["libdir"]'`
+				RUBY_ARCH_LIB_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["archlibdir"] || Config::CONFIG["archlibdir"]'`
+
 				RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["sitearchdir"] || Config::CONFIG["sitearchdir"]'`
 				RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["RUBY_SO_NAME"] || Config::CONFIG["RUBY_SO_NAME"]'`
@@ -19380,8 +19388,12 @@ $as_echo "$as_me: Ruby bin directory is '$RUBY_BIN_DIR'" >&6;}
 $as_echo "$as_me: Ruby site arch is '$RUBY_SITE_ARCH'" >&6;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: Ruby include directory is '$RUBY_INCLUDE_DIR'" >&5
 $as_echo "$as_me: Ruby include directory is '$RUBY_INCLUDE_DIR'" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Ruby config.h include directory is '$RUBY_ARCH_INCLUDE_DIR'" >&5
+$as_echo "$as_me: Ruby config.h include directory is '$RUBY_ARCH_INCLUDE_DIR'" >&6;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: Ruby library directory is '$RUBY_LIB_DIR'" >&5
 $as_echo "$as_me: Ruby library directory is '$RUBY_LIB_DIR'" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Ruby architecture library directory is '$RUBY_ARCH_LIB_DIR'" >&5
+$as_echo "$as_me: Ruby architecture library directory is '$RUBY_ARCH_LIB_DIR'" >&6;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: Ruby extension directory is '$RUBY_EXTENSION_DIR'" >&5
 $as_echo "$as_me: Ruby extension directory is '$RUBY_EXTENSION_DIR'" >&6;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: Ruby library is '$RUBY_SO_NAME'" >&5
@@ -19397,6 +19409,8 @@ $as_echo "$as_me: Ruby import library is '$RUBY_SHARED_LIB'" >&6;}
+
+
 	fi
@@ -19468,6 +19482,7 @@ esac
+
 ac_config_files="$ac_config_files Makefile capi/Makefile capi/geos_c.h doc/Doxyfile doc/Makefile macros/Makefile src/Makefile src/algorithm/Makefile src/algorithm/locate/Makefile src/algorithm/distance/Makefile src/geom/Makefile src/geom/prep/Makefile src/geom/util/Makefile src/geomgraph/Makefile src/geomgraph/index/Makefile include/Makefile include/geos/Makefile include/geos/algorithm/Makefile include/geos/algorithm/locate/Makefile include/geos/algorithm/distance/Makefile include/geos/geom/Makefile include/geos/geom/prep/Makefile include/geos/geom/util/Makefile include/geos/geomgraph/Makefile include/geos/geomgraph/index/Makefile include/geos/index/Makefile include/geos/index/bintree/Makefile include/geos/index/chain/Makefile include/geos/index/intervalrtree/Makefile include/geos/index/quadtree/Makefile include/geos/index/strtree/Makefile include/geos/index/sweepline/Makefile include/geos/io/Makefile include/geos/linearref/Makefile include/geos/noding/Makefile include/geos/noding/snapround/Makefile include/geos/operation/Makefile include/geos/operation/buffer/Makefile include/geos/operation/distance/Makefile include/geos/operation/intersection/Makefile include/geos/operation/linemerge/Makefile include/geos/operation/overlay/Makefile include/geos/operation/overlay/snap/Makefile include/geos/operation/polygonize/Makefile include/geos/operation/predicate/Makefile include/geos/operation/relate/Makefile include/geos/operation/sharedpaths/Makefile include/geos/operation/union/Makefile include/geos/operation/valid/Makefile include/geos/planargraph/Makefile include/geos/planargraph/algorithm/Makefile include/geos/precision/Makefile include/geos/simplify/Makefile include/geos/triangulate/Makefile include/geos/triangulate/quadedge/Makefile include/geos/util/Makefile include/geos/version.h src/index/Makefile src/index/bintree/Makefile src/index/chain/Makefile src/index/intervalrtree/Makefile src/index/quadtree/Makefile src/index/strtree/Makefile src/index/sweepline/Makefile src/io/Makefile src/linearref/Makefile src/noding/Makefile src/noding/snapround/Makefile src/operation/Makefile src/operation/buffer/Makefile src/operation/distance/Makefile src/operation/intersection/Makefile src/operation/linemerge/Makefile src/operation/overlay/Makefile src/operation/polygonize/Makefile src/operation/predicate/Makefile src/operation/relate/Makefile src/operation/sharedpaths/Makefile src/operation/union/Makefile src/operation/valid/Makefile src/planargraph/Makefile src/precision/Makefile src/simplify/Makefile src/triangulate/Makefile src/triangulate/quadedge/Makefile src/util/Makefile swig/geos.i swig/Makefile swig/python/Makefile swig/python/tests/Makefile swig/ruby/Makefile swig/ruby/test/Makefile tests/Makefile tests/bigtest/Makefile tests/unit/Makefile tests/perf/Makefile tests/perf/operation/Makefile tests/perf/operation/buffer/Makefile tests/perf/operation/predicate/Makefile tests/perf/capi/Makefile tests/xmltester/Makefile tests/geostest/Makefile tests/thread/Makefile tools/Makefile tools/geos-config"

configure.ac

@@ -24,8 +24,9 @@ dnl -- encoding ABI break at every release
 dnl
 VERSION_MAJOR=3
 VERSION_MINOR=7
-VERSION_PATCH=0alpha
+VERSION_PATCH=0beta1
 VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
+VERSION_RELEASE=`echo "$VERSION" | sed -E 's/^([[0-9]+\.[0-9]+\.[0-9]+]).*?$/\1/'`
 
 dnl CAPI_VERSION_MAJOR=$(($CAPI_INTERFACE_CURRENT-$CAPI_INTERFACE_AGE))
 dnl the following should be more portable
@@ -372,6 +373,7 @@ AC_SUBST(VERSION)
 AC_SUBST(VERSION_MAJOR)
 AC_SUBST(VERSION_MINOR)
 AC_SUBST(VERSION_PATCH)
+AC_SUBST(VERSION_RELEASE)
 AC_SUBST(INTERFACE_CURRENT)
 AC_SUBST(INTERFACE_REVISION)
 AC_SUBST(INTERFACE_AGE)

debian/changelog

-geos (3.7.0~alpha-1~exp2) UNRELEASED; urgency=medium
+geos (3.7.0~beta1-1~exp1) experimental; urgency=medium
 
-  * Update geos-config patch to not use pre-release in library name.
+  * New upstream beta release.
   * Ignore test failures on riscv64 too.
+  * Drop patches applied upstream, refresh remaining patch.
+  * Update README filename in docs file.
+  * Update symbols for 3.7.0~beta1.
 
- -- Bas Couwenberg <sebastic@debian.org>  Thu, 14 Jun 2018 14:11:18 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Mon, 25 Jun 2018 22:00:03 +0200
 
 geos (3.7.0~alpha-1~exp1) experimental; urgency=medium
 

debian/docs

+AUTHORS
 NEWS
-README
+README.md
 TODO
-AUTHORS

debian/libgeos-3.7.0.symbols

@@ -3164,6 +3164,7 @@ libgeos-3.7.0.so #PACKAGE# #MINVER#
  _ZNK4geos4geom5Point23computeEnvelopeInternalEv@Base 3.4.2
  _ZNK4geos4geom5Point4getXEv@Base 3.4.2
  _ZNK4geos4geom5Point4getYEv@Base 3.4.2
+ _ZNK4geos4geom5Point4getZEv@Base 3.7.0~beta1
  _ZNK4geos4geom5Point5cloneEv@Base 3.4.2
  _ZNK4geos4geom5Point7isEmptyEv@Base 3.4.2
  _ZNK4geos4geom5Point7reverseEv@Base 3.7.0~alpha

debian/libgeos-c1v5.symbols

@@ -110,6 +110,8 @@ libgeos_c.so.1 #PACKAGE# #MINVER#
  GEOSGeomGetX_r@Base 3.4.2
  GEOSGeomGetY@Base 3.4.2
  GEOSGeomGetY_r@Base 3.4.2
+ GEOSGeomGetZ@Base 3.7.0~beta1
+ GEOSGeomGetZ_r@Base 3.7.0~beta1
  GEOSGeomToHEX_buf@Base 3.4.2
  GEOSGeomToHEX_buf_r@Base 3.4.2
  GEOSGeomToWKB_buf@Base 3.4.2

debian/patches/check-local.patch

-Description: Fix check-local failure when quilt patches are applied.
- make  check-local
- make[5]: Entering directory '/build/geos-3.7.0~alpha'
- ! find . -name '*.cpp' -o -name '*.h' | \
-         grep -v ^./tests/xmltester/tinyxml | \
-         xargs grep -n '[[:space:]]$'
- ./.pc/spelling-errors.patch/tests/xmltester/tinyxml/tinyxml.h:83:#endif
- ./.pc/spelling-errors.patch/tests/xmltester/tinyxml/tinyxml.h:98:/*     Internal structure for tracking location of items
- ...
- ./.pc/spelling-errors.patch/tests/xmltester/tinyxml/tinyxml.h:1764:     /** Switch over to "stream printing" which is the most dense formatting without 
- ./.pc/spelling-errors.patch/tests/xmltester/tinyxml/tinyxml.h:1769:                                                                                                     }       
- make[5]: *** [Makefile:931: check-local] Error 1
- make[5]: Leaving directory '/build/geos-3.7.0~alpha'
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: https://trac.osgeo.org/geos/ticket/888
-Applied-Upstream: https://trac.osgeo.org/geos/changeset/9eb81524a0619b71d095dc0b54a7fafa70722b4a/git
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -66,5 +66,5 @@ valgrindcheck:
- 
- check-local:
- 	! find . -name '*.cpp' -o -name '*.h' | \
--		grep -v ^./tests/xmltester/tinyxml | \
-+		grep -v tests/xmltester/tinyxml | \
- 		xargs grep -n '[[:space:]]$$'

debian/patches/disable-docygen-html-timestamp

-Description: Disable HTML timestamps in Doxygen to allow reproducible builds.
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: https://trac.osgeo.org/geos/ticket/742
-Applied-Upstream: https://trac.osgeo.org/geos/changeset/5ac4db28a53cc8762afd976e57fe9ebd565fc8fd/git
-
---- a/doc/Doxyfile.in
-+++ b/doc/Doxyfile.in
-@@ -472,6 +472,12 @@ HTML_FOOTER            =
- 
- HTML_STYLESHEET        = 
- 
-+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-+# page will contain the date and time when the page was generated. Setting
-+# this to NO can help when comparing the output of multiple runs.
-+
-+HTML_TIMESTAMP         = NO
-+
- # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
- # files or namespaces will be aligned in HTML using tables. If set to 
- # NO a bullet list will be used.
---- a/doc/Doxyfile
-+++ b/doc/Doxyfile
-@@ -472,6 +472,12 @@ HTML_FOOTER            =
- 
- HTML_STYLESHEET        = 
- 
-+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-+# page will contain the date and time when the page was generated. Setting
-+# this to NO can help when comparing the output of multiple runs.
-+
-+HTML_TIMESTAMP         = NO
-+
- # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
- # files or namespaces will be aligned in HTML using tables. If set to 
- # NO a bullet list will be used.

debian/patches/geos-config

-Description: Fix library paths.
-Author: Francesco Paolo Lovergine <frankie@debian.org>
-Forwarded: https://trac.osgeo.org/geos/ticket/742
-Applied-Upstream: https://trac.osgeo.org/geos/changeset/96c9e652edb8c1eef12d2e29d01c085aaf6d2c85/git
-
---- a/tools/geos-config.in
-+++ b/tools/geos-config.in
-@@ -43,7 +43,7 @@ case $1 in
-     --libs)
-       # TODO: make an alias for --clibs
-       # see http://trac.osgeo.org/geos/ticket/497
--      echo -L${libdir} -lgeos
-+      echo -L${libdir} -lgeos-@VERSION_RELEASE@
-       ;;
-     --clibs)
-       echo -L${libdir} -lgeos_c

debian/patches/libruby

@@ -5,9 +5,9 @@ Forwarded: not-needed
 
 --- a/configure
 +++ b/configure
-@@ -19364,7 +19364,7 @@ fi
+@@ -19372,7 +19372,7 @@ fi
  
- 				RUBY_LIB_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["libdir"] || Config::CONFIG["libdir"]'`
+ 				RUBY_ARCH_LIB_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["archlibdir"] || Config::CONFIG["archlibdir"]'`
  
 -				RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["sitearchdir"] || Config::CONFIG["sitearchdir"]'`
 +				RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"] || Config::CONFIG["vendorarchdir"]'`
@@ -16,8 +16,8 @@ Forwarded: not-needed
  
 --- a/macros/ruby.m4
 +++ b/macros/ruby.m4
-@@ -35,7 +35,7 @@ AC_DEFUN([AC_RUBY_DEVEL],
- 		RUBY_LIB_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["libdir"]] || Config::CONFIG[["libdir"]]'`
+@@ -41,7 +41,7 @@ AC_DEFUN([AC_RUBY_DEVEL],
+ 		RUBY_ARCH_LIB_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["archlibdir"]] || Config::CONFIG[["archlibdir"]]'`
  
  		dnl Get Ruby extensions directory
 -		RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["sitearchdir"]] || Config::CONFIG[["sitearchdir"]]'`