From 8359ff19bac9a4d35d6e08a93f9836ee64b2537e Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Thu, 12 Aug 2010 07:44:31 +0000
Subject: [PATCH] bump version to 0.7.2

---
 SConstruct                         | 2 +-
 bindings/python/mapnik/__init__.py | 8 ++++++--
 include/mapnik/version.hpp         | 2 +-
 src/SConscript                     | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/SConstruct b/SConstruct
index bf6a3df21..3112dd09b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -968,7 +968,7 @@ if not preconfigured:
         # fetch the mapnik version header in order to set the
         # ABI version used to build libmapnik.so on linux in src/SConscript
         abi = conf.GetMapnikLibVersion()
-        abi_fallback = [0,7,1]
+        abi_fallback = [0,7,2]
         if not abi:
             color_print(1,'Problem encountered parsing mapnik version, falling back to %s' % abi_fallback)
             env['ABI_VERSION'] = abi_fallback
diff --git a/bindings/python/mapnik/__init__.py b/bindings/python/mapnik/__init__.py
index e8f49f3e7..5c4241e60 100644
--- a/bindings/python/mapnik/__init__.py
+++ b/bindings/python/mapnik/__init__.py
@@ -499,14 +499,18 @@ def Kismet(**keywords):
     keywords['type'] = 'kismet'
     return CreateDatasource(keywords)
 
-def mapnik_version_string():
+def mapnik_version_string(version=mapnik_version()):
     """Return the Mapnik version as a string."""
-    version = mapnik_version()
     patch_level = version % 100
     minor_version = version / 100 % 1000
     major_version = version / 100000
     return '%s.%s.%s' % ( major_version, minor_version,patch_level)
 
+def mapnik_version_from_string(version_string):
+    """Return the Mapnik version from a string."""
+    n = version_string.split('.')
+    return (int(n[0]) * 100000) + (int(n[1]) * 100) + (int(n[2]));
+
 def register_plugins(path=inputpluginspath):
     """Register plugins located by specified path"""
     DatasourceCache.instance().register_datasources(path)
diff --git a/include/mapnik/version.hpp b/include/mapnik/version.hpp
index a92ea087b..42b25175d 100644
--- a/include/mapnik/version.hpp
+++ b/include/mapnik/version.hpp
@@ -24,7 +24,7 @@
 #ifndef MAPNIK_VERSION_HPP
 #define MAPNIK_VERSION_HPP
 
-#define MAPNIK_VERSION 701
+#define MAPNIK_VERSION 702
 
 #endif //MAPNIK_VERSION_HPP
 
diff --git a/src/SConscript b/src/SConscript
index 2e146067f..4a7d063f9 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -65,7 +65,7 @@ if env['PLATFORM'] == 'Darwin':
     else:
         lib_path = 'libmapnik.dylib'
     linkflags = '-Wl,-install_name,%s' % lib_path
-    linkflags += ' -current_version 0.7.1 -compatibility_version 0.7.1'
+    linkflags += ' -current_version 0.7.2 -compatibility_version 0.7.2'
 elif env['PLATFORM'] == 'SunOS' and env['CXX'].startswith('CC'):
     linkflags = '-R. -h libmapnik.so'
 else: # Linux and others