[Pkg-javascript-commits] [node-shell-quote] 137/137: merge patched into master
Bastien Roucariès
rouca at moszumanska.debian.org
Fri Aug 25 19:19:46 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 3f0182f3189ed3f1372da8a70be4cf53fff05fb0
Merge: 37b97dc 48260be
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date: Mon Aug 21 14:52:09 2017 +0200
merge patched into master
debian/.git-dpm | 6 +++---
.../0001-Replace-array-map-by-call-to-function.patch | 2 +-
debian/patches/0002-Does-not-use-array-filter.patch | 2 +-
debian/patches/0003-Do-not-use-array-reduce.patch | 2 +-
test/quote.js | 20 ++++++++++----------
5 files changed, 16 insertions(+), 16 deletions(-)
diff --cc debian/.git-dpm
index 2865701,0000000..971a564
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
- 1e417965b13b97712c6c559338b32ec5e3efbed5
- 1e417965b13b97712c6c559338b32ec5e3efbed5
- 09935581cd2b300d74a65bda3b1cbeb52779dd16
++48260be9e0434bb976029423bc58b552d2a5887c
++48260be9e0434bb976029423bc58b552d2a5887c
++a3ac8fbde43dbfe242c7cf9431f2534843dd3594
+a3ac8fbde43dbfe242c7cf9431f2534843dd3594
+node-shell-quote_1.6.1+20160617-git72fb5a8ce29b.orig.tar.xz
+f149cb9313ad2213715a364355e6c5c428f6d9a8
+5772
diff --cc debian/patches/0001-Replace-array-map-by-call-to-function.patch
index f9449ea,0000000..a91e332
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,37 -1,0 +1,37 @@@
- From 643b06853cd2f2bbcb7978549b414f52bb266d5c Mon Sep 17 00:00:00 2001
++From 0e43d3fe942015e0a711d0c7d85ff42c1aa20167 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 | 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..9e3526d 100644
+--- a/package.json
++++ b/package.json
+@@ -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 e4e2ba5,0000000..78009a7
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 9b0fa4b99a0ddbc383349af3aea8f365b1b54e32 Mon Sep 17 00:00:00 2001
++From 9ecf40ac5991857d985d65881c348973598f1f72 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 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 f62ac02,0000000..78111e7
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,41 -1,0 +1,41 @@@
- From 1e417965b13b97712c6c559338b32ec5e3efbed5 Mon Sep 17 00:00:00 2001
++From 48260be9e0434bb976029423bc58b552d2a5887c 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 | 4 +++-
+ package.json | 3 +--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/index.js b/index.js
+index 241f492..d632b0a 100644
+--- a/index.js
++++ b/index.js
+@@ -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(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
More information about the Pkg-javascript-commits
mailing list