[geos-commits] [SCM] GEOS branch svn-3.6 updated. 4fe5ee7e275aa8af8218076ca53b6fb441f0af77
git at osgeo.org
git at osgeo.org
Fri Dec 11 05:40:55 PST 2020
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 4fe5ee7e275aa8af8218076ca53b6fb441f0af77 (commit)
from c681214903875b1b1668fd33a20878df267161f3 (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 4fe5ee7e275aa8af8218076ca53b6fb441f0af77
Author: Sandro Santilli <strk at kbt.io>
Date: Fri Dec 11 14:36:18 2020 +0100
Target next version 3.6.6dev
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 422f4ed..d8cf629 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 5)
+set(VERSION_PATCH 6)
set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
# JTS_PORT is the version of JTS this release is bound to
@@ -38,7 +38,7 @@ message(STATUS "Setting GEOS version ${VERSION} as port of JTS ${JTS_PORT}")
# GEOS C API version
set(CAPI_INTERFACE_CURRENT 11)
-set(CAPI_INTERFACE_REVISION 5)
+set(CAPI_INTERFACE_REVISION 6)
set(CAPI_INTERFACE_AGE 10)
math(EXPR CAPI_VERSION_MAJOR "${CAPI_INTERFACE_CURRENT} - ${CAPI_INTERFACE_AGE}")
diff --git a/HOWTO_RELEASE b/HOWTO_RELEASE
index 87cc436..c5583e1 100644
--- a/HOWTO_RELEASE
+++ b/HOWTO_RELEASE
@@ -39,6 +39,8 @@
- In main CMakeLists.txt main one
- CHANGE the lines: set(VERSION_*
- CAPI_INTERFACE_*
+ - in NEWS
+ - Add new version section
12. Update wiki page https://trac.osgeo.org/geos/ at Download section
- Add latest release
diff --git a/NEWS b/NEWS
index 0339b3c..dead436 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Changes in 3.6.6dev
+YYYY-MM-DD
+
+- Bug fixes / improvements
+ - ...
+
Changes in 3.6.5
2020-12-11
diff --git a/capi/geos_c.h.in b/capi/geos_c.h.in
index de6ea77..de56c01 100644
--- a/capi/geos_c.h.in
+++ b/capi/geos_c.h.in
@@ -60,8 +60,8 @@ extern "C" {
#include <geos/version.h>
#define GEOS_CAPI_VERSION_MAJOR 1
#define GEOS_CAPI_VERSION_MINOR 10
-#define GEOS_CAPI_VERSION_PATCH 5
-#define GEOS_CAPI_VERSION "3.6.5-CAPI-1.10.5"
+#define GEOS_CAPI_VERSION_PATCH 6
+#define GEOS_CAPI_VERSION "3.6.6-CAPI-1.10.6"
#else
#ifndef GEOS_VERSION_MAJOR
#define GEOS_VERSION_MAJOR @VERSION_MAJOR@
diff --git a/configure.ac b/configure.ac
index d9bd10e..152e993 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ JTS_PORT=1.13.0
dnl -- Version info for the CAPI
CAPI_INTERFACE_CURRENT=11
-CAPI_INTERFACE_REVISION=5
+CAPI_INTERFACE_REVISION=6
CAPI_INTERFACE_AGE=10
dnl
@@ -24,7 +24,7 @@ dnl -- encoding ABI break at every release
dnl
VERSION_MAJOR=3
VERSION_MINOR=6
-VERSION_PATCH=5
+VERSION_PATCH=6dev
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 6369a74..64b8df9 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 5
+#define GEOS_VERSION_PATCH 6
#endif
#ifndef GEOS_VERSION
-#define GEOS_VERSION "3.6.5"
+#define GEOS_VERSION "3.6.6"
#endif
#ifndef GEOS_JTS_PORT
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 4 ++--
HOWTO_RELEASE | 2 ++
NEWS | 6 ++++++
capi/geos_c.h.in | 4 ++--
configure.ac | 4 ++--
include/geos/version.h.vc | 4 ++--
6 files changed, 16 insertions(+), 8 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list