From 126d1b73d6c533c347534c96a267678aeee96c32 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Wed, 22 May 2013 06:45:35 -0700
Subject: [PATCH] reflect debug symbolizer in python

---
 SConstruct                                  |  2 +-
 bindings/python/mapnik_debug_symbolizer.cpp | 42 +++++++++++++++++++++
 include/mapnik/version.hpp                  |  2 +-
 3 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 bindings/python/mapnik_debug_symbolizer.cpp

diff --git a/SConstruct b/SConstruct
index 0f96b0a89..488c36193 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1574,7 +1574,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/build.py
         abi = conf.GetMapnikLibVersion()
-        abi_fallback = "2.2.0-pre"
+        abi_fallback = "2.2.0"
         if not abi:
             color_print(1,'Problem encountered parsing mapnik version, falling back to %s' % abi_fallback)
             abi = abi_fallback
diff --git a/bindings/python/mapnik_debug_symbolizer.cpp b/bindings/python/mapnik_debug_symbolizer.cpp
new file mode 100644
index 000000000..6b255967f
--- /dev/null
+++ b/bindings/python/mapnik_debug_symbolizer.cpp
@@ -0,0 +1,42 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2013 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#include <boost/python.hpp>
+#include "mapnik_enumeration.hpp"
+#include <mapnik/debug_symbolizer.hpp>
+
+void export_debug_symbolizer()
+{
+    using namespace boost::python;
+
+    mapnik::enumeration_<mapnik::debug_symbolizer_mode_e>("debug_symbolizer_mode")
+        .value("COLLISION",mapnik::DEBUG_SYM_MODE_COLLISION)
+        .value("VERTEX",mapnik::DEBUG_SYM_MODE_VERTEX)
+        ;
+
+    class_<mapnik::debug_symbolizer>("DebugSymbolizer",
+                             init<>("Default debug Symbolizer"))
+        .add_property("mode",
+                      &mapnik::debug_symbolizer::get_mode,
+                      &mapnik::debug_symbolizer::set_mode)
+        ;
+}
diff --git a/include/mapnik/version.hpp b/include/mapnik/version.hpp
index 35fd1b2a6..e05a3eaeb 100644
--- a/include/mapnik/version.hpp
+++ b/include/mapnik/version.hpp
@@ -23,7 +23,7 @@
 #ifndef MAPNIK_VERSION_HPP
 #define MAPNIK_VERSION_HPP
 
-#define MAPNIK_VERSION_IS_RELEASE 0
+#define MAPNIK_VERSION_IS_RELEASE 1
 
 #define MAPNIK_MAJOR_VERSION 2
 #define MAPNIK_MINOR_VERSION 2