Changeset 1ab32f4 in git

Timestamp:

Oct 25, 2016, 9:42:56 AM (8 years ago)

Author:

Sandro Santilli <strk@…>

Branches:

[(u'svn-3.5', 'b602db59b5c5d0ddce1cee7dbe19d920a3359c8f')]

Children:

['a2018c4f26f44d915adf977604e31bc58188a353']

Parents:

[u'68de59c6fa09a11b7df02d9ac01405e2df82f9fe']

Message:

Retarget to 3.5.2

git-svn-id: ​http://svn.osgeo.org/geos/branches/3.5@4279 5242fede-7e19-0410-aef8-94bd7d2200fb

Files:

• CMakeLists.txt (modified) (2 diffs)
• capi/geos_c.h.in (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• include/geos/version.h.vc (modified) (1 diff)

CMakeLists.txt

@@ -30 +30 @@
 set(VERSION_MAJOR 3)
 set(VERSION_MINOR 5)
-set(VERSION_PATCH 1)
+set(VERSION_PATCH 2)
 set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
@@ -39 +39 @@
 # GEOS C API version
 set(CAPI_INTERFACE_CURRENT 10)
-set(CAPI_INTERFACE_REVISION 1)
+set(CAPI_INTERFACE_REVISION 2)
 set(CAPI_INTERFACE_AGE 9)
 

capi/geos_c.h.in

@@ -61 +61 @@
 #define GEOS_CAPI_VERSION_MAJOR 1
 #define GEOS_CAPI_VERSION_MINOR 9
-#define GEOS_CAPI_VERSION_PATCH 1
-#define GEOS_CAPI_VERSION "3.5.1-CAPI-1.9.1"
+#define GEOS_CAPI_VERSION_PATCH 2
+#define GEOS_CAPI_VERSION "3.5.2-CAPI-1.9.2"
 #else
 #ifndef GEOS_VERSION_MAJOR

configure.ac

@@ -16 +16 @@
 dnl -- Version info for the CAPI
 CAPI_INTERFACE_CURRENT=10
-CAPI_INTERFACE_REVISION=1
+CAPI_INTERFACE_REVISION=2
 CAPI_INTERFACE_AGE=9
 
@@ -25 +25 @@
 VERSION_MAJOR=3
 VERSION_MINOR=5
-VERSION_PATCH=1
+VERSION_PATCH=2
 VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
 

include/geos/version.h.vc

@@ -35 +35 @@
 
 #ifndef GEOS_VERSION_PATCH
-#define GEOS_VERSION_PATCH 1
+#define GEOS_VERSION_PATCH 2
 #endif
 
 #ifndef GEOS_VERSION
-#define GEOS_VERSION "3.5.1"
+#define GEOS_VERSION "3.5.2"
 #endif