[Pkg-javascript-commits] [node-carto] 17/18: Remove patches, they are applied/unneeded

Jérémy Lal kapouer at alioth.debian.org
Fri Oct 25 22:59:52 UTC 2013


This is an automated email from the git hooks/post-receive script.

kapouer pushed a commit to branch master
in repository node-carto.

commit 272ccf06a7f372619b6c04a9ca6c0c766cf65581
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sat Oct 26 00:59:27 2013 +0200

    Remove patches, they are applied/unneeded
---
 debian/patches/01-migrate_to_nodejs.patch |   32 ----------------------
 debian/patches/02-upgrade_code.patch      |   41 -----------------------------
 debian/patches/series                     |    2 --
 3 files changed, 75 deletions(-)

diff --git a/debian/patches/01-migrate_to_nodejs.patch b/debian/patches/01-migrate_to_nodejs.patch
deleted file mode 100644
index c9ca792..0000000
--- a/debian/patches/01-migrate_to_nodejs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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/02-upgrade_code.patch b/debian/patches/02-upgrade_code.patch
deleted file mode 100644
index 1f434c0..0000000
--- a/debian/patches/02-upgrade_code.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
deleted file mode 100644
index f4a333e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-01-migrate_to_nodejs.patch
-02-upgrade_code.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/node-carto.git



More information about the Pkg-javascript-commits mailing list