[Pkg-javascript-commits] [node-shell-quote] 125/137: merge patched into master
Bastien Roucariès
rouca at moszumanska.debian.org
Fri Aug 25 19:19:45 UTC 2017
This is an automated email from the git hooks/post-receive script.
rouca pushed a commit to branch master
in repository node-shell-quote.
commit e7312bfdfea1684e2f8ee3136926f03fe840c6ed
Merge: 9b8c831 4dcf7b6
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date: Mon Aug 21 14:05:31 2017 +0200
merge patched into master
debian/.git-dpm | 4 ++--
.../0001-Replace-array-map-by-call-to-function.patch | 14 ++++----------
debian/patches/0002-Does-not-use-array-filter.patch | 4 ++--
debian/patches/0003-Do-not-use-array-reduce.patch | 4 ++--
package.json | 2 +-
5 files changed, 11 insertions(+), 17 deletions(-)
diff --cc debian/.git-dpm
index 34823d6,0000000..5f9e09f
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- 64c7e8d45b9033870818668b0f0712f07db87dea
- 64c7e8d45b9033870818668b0f0712f07db87dea
++4dcf7b644705b6d11832b184a3d96eee6f4fdaa4
++4dcf7b644705b6d11832b184a3d96eee6f4fdaa4
+09935581cd2b300d74a65bda3b1cbeb52779dd16
+09935581cd2b300d74a65bda3b1cbeb52779dd16
+node-shell-quote_1.6.1.orig.tar.gz
+655eb6df5ddf845ebbceb545c23e2940a9d6a81d
+6256
diff --cc debian/patches/0001-Replace-array-map-by-call-to-function.patch
index 34b26e6,0000000..f9449ea
mode 100644,000000..100644
--- a/debian/patches/0001-Replace-array-map-by-call-to-function.patch
+++ b/debian/patches/0001-Replace-array-map-by-call-to-function.patch
@@@ -1,43 -1,0 +1,37 @@@
- From 4a44be1a882ca5f8447fab935c064a349b86e494 Mon Sep 17 00:00:00 2001
++From 643b06853cd2f2bbcb7978549b414f52bb266d5c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
+Date: Mon, 21 Aug 2017 13:59:47 +0200
+Subject: Replace array-map by call to function
+
+Does not need this package for nodejs >= 6
+
+forwarded: no
+---
+ index.js | 2 +-
- package.json | 5 ++---
- 2 files changed, 3 insertions(+), 4 deletions(-)
++ package.json | 3 +--
++ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/index.js b/index.js
+index 730186b..75c19a5 100644
+--- a/index.js
++++ b/index.js
+@@ -1,5 +1,5 @@
+ var json = typeof JSON !== undefined ? JSON : require('jsonify');
+-var map = require('array-map');
++var map = function(a,f) { return a.map(f); };
+ var filter = require('array-filter');
+ var reduce = require('array-reduce');
+
+diff --git a/package.json b/package.json
- index 1b98b28..263eea0 100644
++index 1b98b28..9e3526d 100644
+--- a/package.json
++++ b/package.json
- @@ -1,4 +1,4 @@
- -{
- +1{
- "name": "shell-quote",
- "version": "1.6.1",
- "description": "quote and parse shell commands",
+@@ -45,7 +45,6 @@
+ "dependencies": {
+ "jsonify": "~0.0.0",
+ "array-filter": "~0.0.0",
+- "array-reduce": "~0.0.0",
+- "array-map": "~0.0.0"
++ "array-reduce": "~0.0.0"
+ }
+ }
diff --cc debian/patches/0002-Does-not-use-array-filter.patch
index 8e691ad,0000000..e4e2ba5
mode 100644,000000..100644
--- a/debian/patches/0002-Does-not-use-array-filter.patch
+++ b/debian/patches/0002-Does-not-use-array-filter.patch
@@@ -1,37 -1,0 +1,37 @@@
- From 29a33d081f7ecb46a4f06456d41b46388385a95c Mon Sep 17 00:00:00 2001
++From 9b0fa4b99a0ddbc383349af3aea8f365b1b54e32 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
+Date: Mon, 21 Aug 2017 14:01:37 +0200
+Subject: Does not use array-filter
+
+This is not needed for nodejs (>= 6)
+
+Forwarded: no
+---
+ index.js | 2 +-
+ package.json | 1 -
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/index.js b/index.js
+index 75c19a5..241f492 100644
+--- a/index.js
++++ b/index.js
+@@ -1,6 +1,6 @@
+ var json = typeof JSON !== undefined ? JSON : require('jsonify');
+ var map = function(a,f) { return a.map(f); };
+-var filter = require('array-filter');
++var filter = function(a,f) { return a.filter(f) ; };
+ var reduce = require('array-reduce');
+
+ exports.quote = function (xs) {
+diff --git a/package.json b/package.json
- index 263eea0..d3b1d7e 100644
++index 9e3526d..6b8839d 100644
+--- a/package.json
++++ b/package.json
+@@ -44,7 +44,6 @@
+ "license": "MIT",
+ "dependencies": {
+ "jsonify": "~0.0.0",
+- "array-filter": "~0.0.0",
+ "array-reduce": "~0.0.0"
+ }
+ }
diff --cc debian/patches/0003-Do-not-use-array-reduce.patch
index 478a007,0000000..1af568c
mode 100644,000000..100644
--- a/debian/patches/0003-Do-not-use-array-reduce.patch
+++ b/debian/patches/0003-Do-not-use-array-reduce.patch
@@@ -1,39 -1,0 +1,39 @@@
- From 64c7e8d45b9033870818668b0f0712f07db87dea Mon Sep 17 00:00:00 2001
++From 4dcf7b644705b6d11832b184a3d96eee6f4fdaa4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
+Date: Mon, 21 Aug 2017 14:03:04 +0200
+Subject: Do not use array-reduce
+
+This is not needed for nodejs (>= 6)
+
+Forwarded: no
+---
+ index.js | 2 +-
+ package.json | 3 +--
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/index.js b/index.js
+index 241f492..8a383df 100644
+--- a/index.js
++++ b/index.js
+@@ -1,7 +1,7 @@
+ var json = typeof JSON !== undefined ? JSON : require('jsonify');
+ var map = function(a,f) { return a.map(f); };
+ var filter = function(a,f) { return a.filter(f) ; };
+-var reduce = require('array-reduce');
++var reduce = function(a,f) { return a.reduce(f) ; };
+
+ exports.quote = function (xs) {
+ return map(xs, function (s) {
+diff --git a/package.json b/package.json
- index d3b1d7e..bb90e65 100644
++index 6b8839d..6f9920f 100644
+--- a/package.json
++++ b/package.json
+@@ -43,7 +43,6 @@
+ },
+ "license": "MIT",
+ "dependencies": {
+- "jsonify": "~0.0.0",
+- "array-reduce": "~0.0.0"
++ "jsonify": "~0.0.0"
+ }
+ }
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-shell-quote.git
More information about the Pkg-javascript-commits
mailing list