[geos-commits] r3722 - in branches/3.3: . swig/python

[svn_geos at osgeo.org]

Author: strk
Date: 2012-11-15 08:31:31 -0800 (Thu, 15 Nov 2012)
New Revision: 3722

Modified:
   branches/3.3/NEWS
   branches/3.3/configure.in
   branches/3.3/swig/python/geos.py
   branches/3.3/swig/python/geos_wrap.cxx
Log:
Set version to 3.3.6

Modified: branches/3.3/NEWS
===================================================================
--- branches/3.3/NEWS	2012-11-15 15:59:35 UTC (rev 3721)
+++ branches/3.3/NEWS	2012-11-15 16:31:31 UTC (rev 3722)
@@ -1,9 +1,9 @@
 Changes in 3.3.6
-YYYY-MM-DD
+2012-11-15 -- that's Post-GIS day !
 
 - Bug fixes / improvements
     - Add support for testing with phpunit 3.6 (not loosing support for 3.4)
-    - Segfault from intersection (#586)
+    - Segfault from intersection (#586, #598, #599)
 
 Changes in 3.3.5
 2012-06-25

Modified: branches/3.3/configure.in
===================================================================
--- branches/3.3/configure.in	2012-11-15 15:59:35 UTC (rev 3721)
+++ branches/3.3/configure.in	2012-11-15 16:31:31 UTC (rev 3722)
@@ -25,7 +25,7 @@
 dnl
 VERSION_MAJOR=3
 VERSION_MINOR=3
-VERSION_PATCH=6dev
+VERSION_PATCH=6
 VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
 
 dnl CAPI_VERSION_MAJOR=$(($CAPI_INTERFACE_CURRENT-$CAPI_INTERFACE_AGE))

Modified: branches/3.3/swig/python/geos.py
===================================================================
--- branches/3.3/swig/python/geos.py	2012-11-15 15:59:35 UTC (rev 3721)
+++ branches/3.3/swig/python/geos.py	2012-11-15 16:31:31 UTC (rev 3722)
@@ -105,6 +105,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-11-15 15:59:35 UTC (rev 3721)
+++ branches/3.3/swig/python/geos_wrap.cxx	2012-11-15 16:31:31 UTC (rev 3722)
@@ -11055,14 +11055,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.6dev"));
+  SWIG_Python_SetConstant(d, "GEOS_VERSION_PATCH",SWIG_From_int(static_cast< int >(6)));
+  SWIG_Python_SetConstant(d, "GEOS_VERSION",SWIG_FromCharPtr("3.3.6"));
   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 >(6)));
   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.6dev-CAPI-1.7.6"));
+  SWIG_Python_SetConstant(d, "GEOS_CAPI_VERSION",SWIG_FromCharPtr("3.3.6-CAPI-1.7.6"));
   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)));