[Pkg-javascript-commits] [node-shell-quote] 128/137: merge patched into master

[Bastien Roucariès]

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 abc33ba6cf7271514dd6badbd95d9e1e7619e116
Merge: b50eb2b 1e41796
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Mon Aug 21 14:21:44 2017 +0200

    merge patched into master

 debian/.git-dpm                                   |  4 ++--
 debian/patches/0003-Do-not-use-array-reduce.patch | 14 ++++++++------
 index.js                                          |  4 +++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --cc debian/.git-dpm
index 5f9e09f,0000000..8fd253f
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
- 4dcf7b644705b6d11832b184a3d96eee6f4fdaa4
- 4dcf7b644705b6d11832b184a3d96eee6f4fdaa4
++1e417965b13b97712c6c559338b32ec5e3efbed5
++1e417965b13b97712c6c559338b32ec5e3efbed5
 +09935581cd2b300d74a65bda3b1cbeb52779dd16
 +09935581cd2b300d74a65bda3b1cbeb52779dd16
 +node-shell-quote_1.6.1.orig.tar.gz
 +655eb6df5ddf845ebbceb545c23e2940a9d6a81d
 +6256
diff --cc debian/patches/0003-Do-not-use-array-reduce.patch
index 1af568c,0000000..f62ac02
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,41 @@@
- From 4dcf7b644705b6d11832b184a3d96eee6f4fdaa4 Mon Sep 17 00:00:00 2001
++From 1e417965b13b97712c6c559338b32ec5e3efbed5 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 +-
++ index.js     | 4 +++-
 + package.json | 3 +--
-  2 files changed, 2 insertions(+), 3 deletions(-)
++ 2 files changed, 4 insertions(+), 3 deletions(-)
 +
 +diff --git a/index.js b/index.js
- index 241f492..8a383df 100644
++index 241f492..d632b0a 100644
 +--- a/index.js
 ++++ b/index.js
- @@ -1,7 +1,7 @@
++@@ -1,7 +1,9 @@
 + 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) ; };
+++var reduce = function(xs,f,acc) {
+++    return arguments.length >= 3 ? xs.reduce(f,acc) : xs.reduce(f);
+++};
 + 
 + exports.quote = function (xs) {
 +     return map(xs, function (s) {
 +diff --git a/package.json b/package.json
 +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