From f874e8844c56550219e1ca44616b1ea129f5000f Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 31 Oct 2013 15:54:15 +0100
Subject: [PATCH] Add Support for Mapnik-2.2.0. Closes #78.

---
 NEWS.md             |  4 +++-
 npm-shrinkwrap.json | 38 ++++++++++++++++++++++++--------------
 package.json        |  6 +++---
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index f3eb39aa..70bb868c 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,6 +1,8 @@
-1.3.7 -- 2013-MM-DD
+1.4.0 -- 2013-10-31
 -------------------
 
+* Add Support for Mapnik-2.2.0 (#78)
+
 1.3.6 -- 2013-10-11
 -------------------
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index fa8fcbcf..924362be 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "1.3.6",
+  "version": "1.4.0",
   "dependencies": {
     "node-varnish": {
       "version": "0.1.1"
@@ -9,34 +9,44 @@
       "version": "1.3.3"
     },
     "windshaft": {
-      "version": "0.13.7",
+      "version": "0.14.1",
       "dependencies": {
         "grainstore": {
-          "version": "0.13.12",
+          "version": "0.14.1",
           "dependencies": {
             "carto": {
-              "version": "0.9.3-cdb6",
-              "from": "git://github.com/CartoDB/carto.git#0.9.3-cdb6",
+              "version": "0.9.5-cdb1",
+              "from": "git://github.com/CartoDB/carto.git#0.9.5-cdb1",
               "dependencies": {
-                "mapnik-reference": {
-                  "version": "5.0.0-cdb1",
-                  "from": "git://github.com/CartoDB/mapnik-reference.git#cdb-5.0"
+                "underscore": {
+                  "version": "1.4.4"
                 },
                 "xml2js": {
-                  "version": "0.1.14",
+                  "version": "0.2.8",
                   "dependencies": {
                     "sax": {
                       "version": "0.5.5"
                     }
                   }
+                },
+                "optimist": {
+                  "version": "0.6.0",
+                  "dependencies": {
+                    "wordwrap": {
+                      "version": "0.0.2"
+                    },
+                    "minimist": {
+                      "version": "0.0.5"
+                    }
+                  }
                 }
               }
             },
             "mapnik-reference": {
-              "version": "5.0.6"
+              "version": "5.0.7"
             },
             "millstone": {
-              "version": "0.6.4",
+              "version": "0.6.8",
               "dependencies": {
                 "underscore": {
                   "version": "1.5.2"
@@ -118,13 +128,13 @@
                   }
                 },
                 "srs": {
-                  "version": "0.3.2"
+                  "version": "0.3.6"
                 },
                 "zipfile": {
-                  "version": "0.4.1"
+                  "version": "0.4.2"
                 },
                 "sqlite3": {
-                  "version": "2.1.17",
+                  "version": "2.1.18",
                   "dependencies": {
                     "progress": {
                       "version": "1.0.1"
diff --git a/package.json b/package.json
index 6b294c5f..a5463015 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "1.3.7",
+    "version": "1.4.0",
     "description": "A map tile server for CartoDB",
     "url": "https://github.com/CartoDB/Windshaft-cartodb",
     "licenses": [{
@@ -21,13 +21,13 @@
     "dependencies": {
         "node-varnish": "0.1.1",
         "underscore"  : "~1.3.3",
-        "windshaft"  : "~0.13.7",
+        "windshaft"  : "~0.14.1",
         "step": "0.0.x",
         "generic-pool": "~2.0.3",
         "redis": "~0.8.3",
         "hiredis": "~0.1.14",
         "request": "2.9.202",
-        "mapnik": "~0.7.14",
+        "mapnik": "~0.7.22",
         "strftime": "~0.6.0",
         "lzma": "~1.2.3"
     },