[Pkg-javascript-commits] [node-labeled-stream-splicer] 13/14: 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-labeled-stream-splicer.

commit 560f98c411c473dee53239f781d241665a0db66e
Merge: afa2623 3ee2aca
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Thu Nov 30 11:08:24 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0001-Use-newer-version-of-is-array.patch       | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 package.json                                       |  2 +-
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index d101697,0000000..a3293d1
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
- a52780b45be32fc8e398dc6a1957299603e30a12
- a52780b45be32fc8e398dc6a1957299603e30a12
++3ee2aca6315972bbd57d5a6b3742ce76b9af5f5f
++3ee2aca6315972bbd57d5a6b3742ce76b9af5f5f
 +a52780b45be32fc8e398dc6a1957299603e30a12
 +a52780b45be32fc8e398dc6a1957299603e30a12
 +node-labeled-stream-splicer_2.0.0.orig.tar.gz
 +1e60d287d4214cd3a7400a5c8134664d4be0d80b
 +3856
diff --cc debian/patches/0001-Use-newer-version-of-is-array.patch
index 0000000,0000000..4eb7290
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-newer-version-of-is-array.patch
@@@ -1,0 -1,0 +1,24 @@@
++From 3ee2aca6315972bbd57d5a6b3742ce76b9af5f5f Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Thu, 30 Nov 2017 11:00:23 +0100
++Subject: Use newer version of is-array
++
++Forwarded: yes
++bug: https://github.com/browserify/labeled-stream-splicer/pull/8
++---
++ package.json | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/package.json b/package.json
++index f2f2929..b7ddada 100644
++--- a/package.json
+++++ b/package.json
++@@ -5,7 +5,7 @@
++   "main": "index.js",
++   "dependencies": {
++     "inherits": "^2.0.1",
++-    "isarray": "~0.0.1",
+++    "isarray": "^1.0.0",
++     "stream-splicer": "^2.0.0"
++   },
++   "devDependencies": {
diff --cc debian/patches/series
index 0000000,0000000..9047a7f
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-newer-version-of-is-array.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-labeled-stream-splicer.git