[Pkg-javascript-commits] [node-module-deps] 442/444: 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-module-deps.

commit beb70086fca8229d05f25110bccae62ed20ab941
Merge: bca6dc9 60e51c3
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Mon Sep 25 15:26:25 2017 +0200

    merge patched into master

 debian/.git-dpm                                 |  4 ++--
 debian/patches/0001-Avoid-readable-stream.patch | 23 +++++++++++++++++++++++
 debian/patches/series                           |  1 +
 index.js                                        |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 2d6f597,0000000..94ea2c7
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
- 4cce7975e909b91775411731a28e9d7e123e7079
- 4cce7975e909b91775411731a28e9d7e123e7079
++60e51c3e7a6a353cc65fa2bd40886211b9a8542b
++60e51c3e7a6a353cc65fa2bd40886211b9a8542b
 +4cce7975e909b91775411731a28e9d7e123e7079
 +4cce7975e909b91775411731a28e9d7e123e7079
 +node-module-deps_4.1.1.orig.tar.gz
 +ee5ab5313223d1f9c5a9fc8e60eca2caf275df30
 +20089
diff --cc debian/patches/0001-Avoid-readable-stream.patch
index 0000000,0000000..90c16cf
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Avoid-readable-stream.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 60e51c3e7a6a353cc65fa2bd40886211b9a8542b Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Mon, 25 Sep 2017 15:26:10 +0200
++Subject: Avoid readable-stream
++
++Forwarded: no
++---
++ index.js | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/index.js b/index.js
++index 45cbeac..0e01486 100644
++--- a/index.js
+++++ b/index.js
++@@ -14,7 +14,7 @@ var xtend = require('xtend');
++ var defined = require('defined');
++ 
++ var inherits = require('inherits');
++-var Transform = require('readable-stream').Transform;
+++var Transform = require('stream').Transform;
++ 
++ module.exports = Deps;
++ inherits(Deps, Transform);
diff --cc debian/patches/series
index 0000000,0000000..99f040b
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Avoid-readable-stream.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-module-deps.git