[geos-commits] r3658 - in branches/3.3: . capi include/geos swig/python

[svn_geos at osgeo.org]

Author: strk
Date: 2012-05-29 23:42:49 -0700 (Tue, 29 May 2012)
New Revision: 3658

Modified:
   branches/3.3/NEWS
   branches/3.3/capi/geos_c.h.in
   branches/3.3/configure.in
   branches/3.3/include/geos/version.h.vc
   branches/3.3/swig/python/geos.py
   branches/3.3/swig/python/geos_wrap.cxx
Log:
Fix release date and version for 3.3.4

Modified: branches/3.3/NEWS
===================================================================
--- branches/3.3/NEWS	2012-05-29 19:23:18 UTC (rev 3657)
+++ branches/3.3/NEWS	2012-05-30 06:42:49 UTC (rev 3658)
@@ -1,5 +1,5 @@
 Changes in 3.3.4
-2012-??-??
+2012-05-31
 
 - Bug fixes / improvements
     - Do not abort on NaN overlay input (#530)

Modified: branches/3.3/capi/geos_c.h.in
===================================================================
--- branches/3.3/capi/geos_c.h.in	2012-05-29 19:23:18 UTC (rev 3657)
+++ branches/3.3/capi/geos_c.h.in	2012-05-30 06:42:49 UTC (rev 3658)
@@ -56,8 +56,8 @@
 #include <geos/version.h>
 #define GEOS_CAPI_VERSION_MAJOR 1
 #define GEOS_CAPI_VERSION_MINOR 7
-#define GEOS_CAPI_VERSION_PATCH 1
-#define GEOS_CAPI_VERSION "3.3.4-CAPI-1.7.1"
+#define GEOS_CAPI_VERSION_PATCH 3
+#define GEOS_CAPI_VERSION "3.3.4-CAPI-1.7.3"
 #else
 #ifndef GEOS_VERSION_MAJOR
 #define GEOS_VERSION_MAJOR @VERSION_MAJOR@

Modified: branches/3.3/configure.in
===================================================================
--- branches/3.3/configure.in	2012-05-29 19:23:18 UTC (rev 3657)
+++ branches/3.3/configure.in	2012-05-30 06:42:49 UTC (rev 3658)
@@ -25,7 +25,7 @@
 dnl
 VERSION_MAJOR=3
 VERSION_MINOR=3
-VERSION_PATCH=4dev
+VERSION_PATCH=4
 VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
 
 dnl CAPI_VERSION_MAJOR=$(($CAPI_INTERFACE_CURRENT-$CAPI_INTERFACE_AGE))

Modified: branches/3.3/include/geos/version.h.vc
===================================================================
--- branches/3.3/include/geos/version.h.vc	2012-05-29 19:23:18 UTC (rev 3657)
+++ branches/3.3/include/geos/version.h.vc	2012-05-30 06:42:49 UTC (rev 3658)
@@ -35,15 +35,15 @@
 #endif
 
 #ifndef GEOS_VERSION_PATCH
-#define GEOS_VERSION_PATCH 0
+#define GEOS_VERSION_PATCH 4
 #endif
 
 #ifndef GEOS_VERSION
-#define GEOS_VERSION "3.3.0"
+#define GEOS_VERSION "3.3.4"
 #endif
 
 #ifndef GEOS_JTS_PORT
-#define GEOS_JTS_PORT "1.10.0"
+#define GEOS_JTS_PORT "1.12.0"
 #endif
 
 #endif // GEOS_VERSION_H_INCLUDED

Modified: branches/3.3/swig/python/geos.py
===================================================================
--- branches/3.3/swig/python/geos.py	2012-05-29 19:23:18 UTC (rev 3657)
+++ branches/3.3/swig/python/geos.py	2012-05-30 06:42:49 UTC (rev 3658)
@@ -103,6 +103,7 @@
 
 GEOS_VERSION_MAJOR = _geos.GEOS_VERSION_MAJOR
 GEOS_VERSION_MINOR = _geos.GEOS_VERSION_MINOR
+GEOS_VERSION_PATCH = _geos.GEOS_VERSION_PATCH
 GEOS_VERSION = _geos.GEOS_VERSION
 GEOS_JTS_PORT = _geos.GEOS_JTS_PORT
 GEOS_CAPI_VERSION_MAJOR = _geos.GEOS_CAPI_VERSION_MAJOR

Modified: branches/3.3/swig/python/geos_wrap.cxx
===================================================================
--- branches/3.3/swig/python/geos_wrap.cxx	2012-05-29 19:23:18 UTC (rev 3657)
+++ branches/3.3/swig/python/geos_wrap.cxx	2012-05-30 06:42:49 UTC (rev 3658)
@@ -10696,14 +10696,15 @@
   
   SWIG_Python_SetConstant(d, "GEOS_VERSION_MAJOR",SWIG_From_int(static_cast< int >(3)));
   SWIG_Python_SetConstant(d, "GEOS_VERSION_MINOR",SWIG_From_int(static_cast< int >(3)));
-  SWIG_Python_SetConstant(d, "GEOS_VERSION",SWIG_FromCharPtr("3.3.4dev"));
+  SWIG_Python_SetConstant(d, "GEOS_VERSION_PATCH",SWIG_From_int(static_cast< int >(4)));
+  SWIG_Python_SetConstant(d, "GEOS_VERSION",SWIG_FromCharPtr("3.3.4"));
   SWIG_Python_SetConstant(d, "GEOS_JTS_PORT",SWIG_FromCharPtr("1.12.0"));
   SWIG_Python_SetConstant(d, "GEOS_CAPI_VERSION_MAJOR",SWIG_From_int(static_cast< int >(1)));
   SWIG_Python_SetConstant(d, "GEOS_CAPI_VERSION_MINOR",SWIG_From_int(static_cast< int >(7)));
   SWIG_Python_SetConstant(d, "GEOS_CAPI_VERSION_PATCH",SWIG_From_int(static_cast< int >(3)));
   SWIG_Python_SetConstant(d, "GEOS_CAPI_FIRST_INTERFACE",SWIG_From_int(static_cast< int >(1)));
   SWIG_Python_SetConstant(d, "GEOS_CAPI_LAST_INTERFACE",SWIG_From_int(static_cast< int >((1+7))));
-  SWIG_Python_SetConstant(d, "GEOS_CAPI_VERSION",SWIG_FromCharPtr("3.3.4dev-CAPI-1.7.3"));
+  SWIG_Python_SetConstant(d, "GEOS_CAPI_VERSION",SWIG_FromCharPtr("3.3.4-CAPI-1.7.3"));
   SWIG_Python_SetConstant(d, "GEOS_POINT",SWIG_From_int(static_cast< int >(GEOS_POINT)));
   SWIG_Python_SetConstant(d, "GEOS_LINESTRING",SWIG_From_int(static_cast< int >(GEOS_LINESTRING)));
   SWIG_Python_SetConstant(d, "GEOS_LINEARRING",SWIG_From_int(static_cast< int >(GEOS_LINEARRING)));