[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 47527f849bd175d66ca6533062c0a9c234cb1a7a
Author: David Paleino <dapal at debian.org>
Date:   Thu Sep 20 10:48:34 2012 +0200

    Migrate from node to nodejs (Closes: #686897)

diff --git a/debian/changelog b/debian/changelog
index 459c51f..bc2e6da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+node-carto (0.4.6+ds1-2) UNRELEASED; urgency=low
+
+  * Migrate from node to nodejs (Closes: #686897)
+
+ -- David Paleino <dapal at debian.org>  Thu, 20 Sep 2012 10:47:56 +0200
+
 node-carto (0.4.6+ds1-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/control b/debian/control
index 358e041..198fef2 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Package: carto
 Architecture: all
 Depends:
  ${misc:Depends}
- , nodejs
+ , nodejs (>= 0.6.19~dfsg-1-3~)
  , node-xml2js
  , node-underscore
 Provides: node-carto
diff --git a/debian/patches/01-migrate_to_nodejs.patch b/debian/patches/01-migrate_to_nodejs.patch
new file mode 100644
index 0000000..c9ca792
--- /dev/null
+++ b/debian/patches/01-migrate_to_nodejs.patch
@@ -0,0 +1,32 @@
+From: David Paleino <dapal at debian.org>
+Subject: migrate from node to nodejs
+Forwarded: not-needed
+
+---
+ bin/carto       |    2 +-
+ bin/mml2json.js |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- node-carto.orig/bin/carto
++++ node-carto/bin/carto
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env node
++#!/usr/bin/nodejs
+ 
+ var path = require('path'),
+     fs = require('fs'),
+--- node-carto.orig/bin/mml2json.js
++++ node-carto/bin/mml2json.js
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env node
++#!/usr/bin/nodejs
+ 
+ var xml2js = require('xml2js'),
+     fs = require('fs'),
+@@ -64,4 +64,4 @@ fs.readFile(process.ARGV[2], 'utf-8', fu
+         }, 4));
+     });
+     parser.parseString(data);
+-});
+\ No newline at end of file
++});
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..09e0b78
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-migrate_to_nodejs.patch

-- 
Mapnik stylesheet compiler