[geos-commits] [SCM] geos branch svn-3.6 updated. 4d2925d6e0c758742a178053132eef02cd8374d2

git at osgeo.org git at osgeo.org
Tue Jul 25 02:17:36 PDT 2017


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  4d2925d6e0c758742a178053132eef02cd8374d2 (commit)
      from  6df0fd66e29a97219f66d99e24b8cf95f4149e03 (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 4d2925d6e0c758742a178053132eef02cd8374d2
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Jul 25 11:17:15 2017 +0200

    Fix 3.6.2 versions in more places

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e25b70..927a0fe 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 2dev)
+set(VERSION_PATCH 2)
 set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 # JTS_PORT is the version of JTS this release is bound to
diff --git a/HOWTO_RELEASE b/HOWTO_RELEASE
index c86daa2..09dad15 100644
--- a/HOWTO_RELEASE
+++ b/HOWTO_RELEASE
@@ -29,7 +29,7 @@
       [ THIS MUST BE CAREFULLY AVOIDED ]
 
 11. Increment release version:
-    - In configure.in
+    - In configure.ac
     - In include/geos/version.h.vc
     - In capi/geos_c.h.in
       - VERSION_PATCH for bugfixes/improvements (even breaking C++ API)
diff --git a/capi/geos_c.h.in b/capi/geos_c.h.in
index 2446af4..f7131e0 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 1
-#define GEOS_CAPI_VERSION "3.6.1-CAPI-1.10.1"
+#define GEOS_CAPI_VERSION_PATCH 2
+#define GEOS_CAPI_VERSION "3.6.2-CAPI-1.10.2"
 #else
 #ifndef GEOS_VERSION_MAJOR
 #define GEOS_VERSION_MAJOR @VERSION_MAJOR@
diff --git a/include/geos/version.h.vc b/include/geos/version.h.vc
index 2994127..869c3ce 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 1
+#define GEOS_VERSION_PATCH 2
 #endif
 
 #ifndef GEOS_VERSION
-#define GEOS_VERSION "3.6.1"
+#define GEOS_VERSION "3.6.2"
 #endif
 
 #ifndef GEOS_JTS_PORT

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

Summary of changes:
 CMakeLists.txt            |    2 +-
 HOWTO_RELEASE             |    2 +-
 capi/geos_c.h.in          |    4 ++--
 include/geos/version.h.vc |    4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
geos


More information about the geos-commits mailing list