From 31ae5e632b5243357ac5a3a46aa8aabaa205c8f4 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 22 May 2013 10:22:25 -0700 Subject: [PATCH] rollback accidentally commited change in 126d1b73d6c533 - not quite yet --- SConstruct | 2 +- include/mapnik/version.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index f36603501..a25b03e0c 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" + abi_fallback = "2.2.0-pre" if not abi: color_print(1,'Problem encountered parsing mapnik version, falling back to %s' % abi_fallback) abi = abi_fallback diff --git a/include/mapnik/version.hpp b/include/mapnik/version.hpp index e05a3eaeb..35fd1b2a6 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 1 +#define MAPNIK_VERSION_IS_RELEASE 0 #define MAPNIK_MAJOR_VERSION 2 #define MAPNIK_MINOR_VERSION 2