[geos-commits] r4085 - in trunk: . capi include/geos

[svn_geos at osgeo.org]

Author: pramsey
Date: 2015-08-16 15:19:47 -0700 (Sun, 16 Aug 2015)
New Revision: 4085

Modified:
   trunk/CMakeLists.txt
   trunk/HOWTO_RELEASE
   trunk/NEWS
   trunk/capi/geos_c.h.in
   trunk/configure.ac
   trunk/include/geos/version.h.vc
Log:
Bump trunk versions to 3.6


Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2015-08-14 18:34:11 UTC (rev 4084)
+++ trunk/CMakeLists.txt	2015-08-16 22:19:47 UTC (rev 4085)
@@ -28,7 +28,7 @@
 # GEOS release version
 # GEOS C++ library SONAME will use these encoding ABI break at every release
 set(VERSION_MAJOR 3)
-set(VERSION_MINOR 5)
+set(VERSION_MINOR 6)
 set(VERSION_PATCH 0dev)
 set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
@@ -37,7 +37,7 @@
 message(STATUS "Setting GEOS version ${VERSION} as port of JTS ${JTS_PORT}")
 
 # GEOS C API version
-set(CAPI_INTERFACE_CURRENT 10)
+set(CAPI_INTERFACE_CURRENT 11)
 set(CAPI_INTERFACE_REVISION 0)
 set(CAPI_INTERFACE_AGE 9)
 

Modified: trunk/HOWTO_RELEASE
===================================================================
--- trunk/HOWTO_RELEASE	2015-08-14 18:34:11 UTC (rev 4084)
+++ trunk/HOWTO_RELEASE	2015-08-16 22:19:47 UTC (rev 4085)
@@ -33,7 +33,7 @@
      [ THIS MUST BE CAREFULLY AVOIDED ]
 
 12: 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)

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2015-08-14 18:34:11 UTC (rev 4084)
+++ trunk/NEWS	2015-08-16 22:19:47 UTC (rev 4085)
@@ -1,5 +1,13 @@
+Changes in 3.6.0
+2015-MM-DD
+
+- New things:
+- Improvements:
+- C++ API changes:
+
+
 Changes in 3.5.0
-2013-MM-DD
+2015-08-16
 
 - New things:
   - Voronoi API (#627)

Modified: trunk/capi/geos_c.h.in
===================================================================
--- trunk/capi/geos_c.h.in	2015-08-14 18:34:11 UTC (rev 4084)
+++ trunk/capi/geos_c.h.in	2015-08-16 22:19:47 UTC (rev 4085)
@@ -59,9 +59,9 @@
 #if defined(_MSC_VER)
 #include <geos/version.h>
 #define GEOS_CAPI_VERSION_MAJOR 1
-#define GEOS_CAPI_VERSION_MINOR 9
+#define GEOS_CAPI_VERSION_MINOR 11
 #define GEOS_CAPI_VERSION_PATCH 0
-#define GEOS_CAPI_VERSION "3.5.0-CAPI-1.9.0"
+#define GEOS_CAPI_VERSION "3.6.0-CAPI-1.11.0"
 #else
 #ifndef GEOS_VERSION_MAJOR
 #define GEOS_VERSION_MAJOR @VERSION_MAJOR@

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2015-08-14 18:34:11 UTC (rev 4084)
+++ trunk/configure.ac	2015-08-16 22:19:47 UTC (rev 4085)
@@ -14,7 +14,7 @@
 JTS_PORT=1.13.0
 
 dnl -- Version info for the CAPI
-CAPI_INTERFACE_CURRENT=10
+CAPI_INTERFACE_CURRENT=11
 CAPI_INTERFACE_REVISION=0
 CAPI_INTERFACE_AGE=9
 
@@ -23,7 +23,7 @@
 dnl -- encoding ABI break at every release
 dnl
 VERSION_MAJOR=3
-VERSION_MINOR=5
+VERSION_MINOR=6
 VERSION_PATCH=0dev
 VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
 

Modified: trunk/include/geos/version.h.vc
===================================================================
--- trunk/include/geos/version.h.vc	2015-08-14 18:34:11 UTC (rev 4084)
+++ trunk/include/geos/version.h.vc	2015-08-16 22:19:47 UTC (rev 4085)
@@ -30,7 +30,7 @@
 #endif
 
 #ifndef GEOS_VERSION_MINOR
-#define GEOS_VERSION_MINOR 5
+#define GEOS_VERSION_MINOR 6
 #endif
 
 #ifndef GEOS_VERSION_PATCH
@@ -38,7 +38,7 @@
 #endif
 
 #ifndef GEOS_VERSION
-#define GEOS_VERSION "3.5.0"
+#define GEOS_VERSION "3.6.0"
 #endif
 
 #ifndef GEOS_JTS_PORT