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

[David Paleino]

The following commit has been merged in the master branch:
commit f97439bc45012d2601d1ac195976e38cdd0a81e8
Author: David Paleino <dapal at debian.org>
Date:   Sun Jan 27 20:29:11 2013 +0100

    Upgraded carto and mml2json code to work with newer versions of nodejs.

diff --git a/debian/changelog b/debian/changelog
index 37c06f5..d905f86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+node-carto (0.4.6+ds1-4) UNRELEASED; urgency=low
+
+  * Upgraded carto and mml2json code to work with newer versions of
+    nodejs.
+
+ -- David Paleino <dapal at debian.org>  Sun, 27 Jan 2013 20:28:44 +0100
+
 node-carto (0.4.6+ds1-3) unstable; urgency=low
 
   * Add missing Recommends on node-millstone
diff --git a/debian/patches/02-upgrade_code.patch b/debian/patches/02-upgrade_code.patch
new file mode 100644
index 0000000..1f434c0
--- /dev/null
+++ b/debian/patches/02-upgrade_code.patch
@@ -0,0 +1,41 @@
+From: David Paleino <dapal at debian.org>
+Subject: fix code to work with newer nodejs
+Origin: vendor
+Forwarded: no
+
+---
+ bin/carto       |    2 +-
+ bin/mml2json.js |    6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+--- node-carto.orig/bin/mml2json.js
++++ node-carto/bin/mml2json.js
+@@ -2,14 +2,14 @@
+ 
+ var xml2js = require('xml2js'),
+     fs = require('fs'),
+-    sys = require('sys');
++    sys = require('util');
+ 
+-if (!process.ARGV[2]) {
++if (!process.argv[2]) {
+     console.log('Please specify a XML file.');
+     process.exit(1);
+ }
+ 
+-fs.readFile(process.ARGV[2], 'utf-8', function(err, data) {
++fs.readFile(process.argv[2], 'utf-8', function(err, data) {
+     if (err) throw err;
+ 
+     // Replace entities.
+--- node-carto.orig/bin/carto
++++ node-carto/bin/carto
+@@ -2,7 +2,7 @@
+ 
+ var path = require('path'),
+     fs = require('fs'),
+-    sys = require('sys'),
++    sys = require('util'),
+     carto = require('carto');
+ 
+ var args = process.argv.slice(1);
diff --git a/debian/patches/series b/debian/patches/series
index 09e0b78..f4a333e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-migrate_to_nodejs.patch
+02-upgrade_code.patch

-- 
Mapnik stylesheet compiler