[geos-commits] [SCM] GEOS branch svn-3.6 updated. 266bd28153697a80503413f3d7e2ec9caf5c5a74

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, svn-3.6 has been updated
       via  266bd28153697a80503413f3d7e2ec9caf5c5a74 (commit)
       via  77b5269af38cd0abfab6fe71fb0084482e669815 (commit)
      from  e7caa33f69314fe4e3b9b0cee23eb9ca10ceb932 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 266bd28153697a80503413f3d7e2ec9caf5c5a74
Merge: e7caa33 77b5269
Author: Sandro Santilli <strk at kbt.io>
Date:   Fri Dec 11 12:51:38 2020 +0100

    Merge tag '3.6.4' into svn-3.6

diff --cc NEWS
index 0cf02c5,b406417..7b26143
--- a/NEWS
+++ b/NEWS
@@@ -12,9 -12,7 +12,8 @@@ Changes in 3.6.
    - Static library does not contain C API (#878)
    - Prevent crash when querying empty STRtree (#730)
    - Overlay performance improvement (#986, Paul Ramsey)
 +  - Relate crash with empty components (#1085, Sandro Santilli)
  
- 
  Changes in 3.6.3
  2018-08-06
  

commit 77b5269af38cd0abfab6fe71fb0084482e669815
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Oct 4 21:32:17 2019 +0000

    Pre-release commit

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81ccaa3..e7d2451 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules")
 # GEOS C++ library SONAME will use these encoding ABI break at every release
 set(VERSION_MAJOR 3)
 set(VERSION_MINOR 6)
-set(VERSION_PATCH 4dev)
+set(VERSION_PATCH 4)
 set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 # JTS_PORT is the version of JTS this release is bound to
diff --git a/NEWS b/NEWS
index 6ec1c06..b406417 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
 Changes in 3.6.4
-2018-XX-XX
+2019-10-04
 
 - Bug fixes / improvements
   - Fix crash in GEOSUnaryUnion with empty LineString
@@ -13,7 +13,6 @@ Changes in 3.6.4
   - Prevent crash when querying empty STRtree (#730)
   - Overlay performance improvement (#986, Paul Ramsey)
 
-
 Changes in 3.6.3
 2018-08-06
 
diff --git a/configure.ac b/configure.ac
index 15f9ece..eb30b28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ dnl -- encoding ABI break at every release
 dnl
 VERSION_MAJOR=3
 VERSION_MINOR=6
-VERSION_PATCH=4dev
+VERSION_PATCH=4
 VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
 
 dnl CAPI_VERSION_MAJOR=$(($CAPI_INTERFACE_CURRENT-$CAPI_INTERFACE_AGE))
diff --git a/include/geos/version.h.vc b/include/geos/version.h.vc
index b31f58f..2cf394d 100644
--- a/include/geos/version.h.vc
+++ b/include/geos/version.h.vc
@@ -34,11 +34,11 @@
 #endif
 
 #ifndef GEOS_VERSION_PATCH
-#define GEOS_VERSION_PATCH 3
+#define GEOS_VERSION_PATCH 4
 #endif
 
 #ifndef GEOS_VERSION
-#define GEOS_VERSION "3.6.3"
+#define GEOS_VERSION "3.6.4"
 #endif
 
 #ifndef GEOS_JTS_PORT

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt            | 2 +-
 NEWS                      | 3 +--
 configure.ac              | 2 +-
 include/geos/version.h.vc | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GEOS