[Pkg-javascript-commits] [SCM] Mapnik stylesheet compiler branch, master, updated. debian/0.4.6+ds1-2-4-g9591572

[David Paleino]

The following commit has been merged in the master branch:
commit 5c270c19c59d5c3c2d3584f69008d9ab862026cf
Merge: 822b938578cb711ed223e232c9e73c445f8fcda6 6edeb28f3b2715db68e45594da34501a25979d0a
Author: David Paleino <dapal at debian.org>
Date:   Thu Sep 20 10:57:37 2012 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/collab-maint/node-carto
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/patches/series

diff --combined debian/control
index f2e4dcd,4ce503e..7cb6ac6
--- a/debian/control
+++ b/debian/control
@@@ -6,7 -6,7 +6,7 @@@ Uploaders: David Paleino <dapal at debian.
  Build-Depends:
   debhelper (>= 8~)
   , dh-buildinfo
 -Standards-Version: 3.9.3
 +Standards-Version: 3.9.4
  Homepage: http://github.com/mapbox/carto
  Vcs-Git: git://git.debian.org/collab-maint/node-carto.git
  Vcs-Browser: http://git.debian.org/?p=collab-maint/node-carto.git;a=summary
@@@ -15,9 -15,11 +15,11 @@@ Package: cart
  Architecture: all
  Depends:
   ${misc:Depends}
-  , nodejs (>= 0.6.19~dfsg-1-3~)
 - , nodejs (>= 0.6.19~dfsg1-3)
++ , nodejs (>= 0.6.19~dfsg1-3~)
   , node-xml2js
   , node-underscore
+ Recommends:
+  node-millstone
  Provides: node-carto
  Description: Mapnik stylesheet compiler
   Carto is a stylesheet renderer for Mapnik. It's an evolution of the Cascadenik

-- 
Mapnik stylesheet compiler