From 41d7000daf24d1c47e263ab20b827e3d17b4b7b1 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 8 Oct 2012 18:02:28 +0200
Subject: [PATCH] Update windshaft to 0.6 exposing CartoCSS versioning support

---
 NEWS.md             |  6 +++++-
 npm-shrinkwrap.json | 25 +++++++------------------
 package.json        |  6 +++---
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 7dc4577f..29626c1b 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,6 +1,10 @@
 1.1.0 (DD/MM/YY)
 -----
-* Autodetected (and configurable) target mapnik version
+* Add /version entry point
+* CartoCSS versioning
+ * Include version in GET /style response
+ * Support version and convert parameters in POST /style request
+ * Autodetect target mapnik version and let config override it
 * Configurable logging format (#4)
 * Detailed error on missing user metadata 
 * Properly handle unauthenticated requests for metadata
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index b36c59cb..305558bf 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "dependencies": {
     "cluster2": {
       "version": "0.3.5-cdb01",
@@ -177,20 +177,16 @@
       "version": "0.1.1"
     },
     "underscore": {
-      "version": "1.1.7"
+      "version": "1.3.3"
     },
     "grainstore": {
-      "version": "0.6.4",
+      "version": "0.8.1",
       "dependencies": {
         "carto": {
-          "version": "0.8.2-cdb-dev-3",
-          "from": "git://github.com/CartoDB/carto.git#cdb-0.8",
+          "version": "0.9.2",
           "dependencies": {
-            "underscore": {
-              "version": "1.3.3"
-            },
             "mapnik-reference": {
-              "version": "4.0.5"
+              "version": "5.0.0"
             },
             "xml2js": {
               "version": "0.1.14",
@@ -203,12 +199,8 @@
           }
         },
         "millstone": {
-          "version": "0.5.10-cdb-01",
-          "from": "git://github.com/CartoDB/millstone.git#cdb-node04-devel",
+          "version": "0.5.10",
           "dependencies": {
-            "underscore": {
-              "version": "1.3.3"
-            },
             "request": {
               "version": "2.11.4",
               "dependencies": {
@@ -253,11 +245,8 @@
       }
     },
     "windshaft": {
-      "version": "0.5.8",
+      "version": "0.6.0",
       "dependencies": {
-        "underscore": {
-          "version": "1.3.3"
-        },
         "express": {
           "version": "2.5.11",
           "dependencies": {
diff --git a/package.json b/package.json
index 86b47146..1fdde1bf 100644
--- a/package.json
+++ b/package.json
@@ -20,9 +20,9 @@
     "dependencies": {
         "cluster2": "git://github.com/CartoDB/cluster2.git#28cde11",
         "node-varnish": "0.1.1",
-        "underscore"  : "1.1.x",
-        "grainstore"  : "~0.6.2",
-        "windshaft"  : "~0.5.8",
+        "underscore"  : "~1.3.3",
+        "grainstore"  : "~0.8.0",
+        "windshaft"  : "~0.6.0",
         "step": "0.0.x",
         "generic-pool": "1.0.x",
         "redis": "0.7.2",