[Pkg-javascript-commits] [node-stream-http] 196/208: 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-stream-http.

commit eabba28ff76fb25e7542a08d8c52bad07619a753
Merge: cd45db6 2c13206
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Mon Jun 12 16:18:16 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../patches/0001-Use-extend-instead-of-xtend.patch | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 index.js                                           |  2 +-
 package.json                                       |  2 +-
 5 files changed, 40 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index c85c37f,0000000..a6ad592
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
- 8eab4b3e5f0502ec6a2d7babc60b7b2ae8ebb17a
- 8eab4b3e5f0502ec6a2d7babc60b7b2ae8ebb17a
++2c1320687c473cda1ae4a611094f3906fc4d9026
++2c1320687c473cda1ae4a611094f3906fc4d9026
 +8eab4b3e5f0502ec6a2d7babc60b7b2ae8ebb17a
 +8eab4b3e5f0502ec6a2d7babc60b7b2ae8ebb17a
 +node-stream-http_2.7.1.orig.tar.gz
 +e35e3d120e19670e8103b8b43da7a40010d81366
 +49030
diff --cc debian/patches/0001-Use-extend-instead-of-xtend.patch
index 0000000,0000000..596a8b3
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-extend-instead-of-xtend.patch
@@@ -1,0 -1,0 +1,35 @@@
++From 2c1320687c473cda1ae4a611094f3906fc4d9026 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Mon, 12 Jun 2017 16:17:47 +0200
++Subject: Use extend instead of xtend
++
++Forwarded: no
++---
++ index.js     | 2 +-
++ package.json | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/index.js b/index.js
++index 829290c..4443ffa 100644
++--- a/index.js
+++++ b/index.js
++@@ -1,5 +1,5 @@
++ var ClientRequest = require('./lib/request')
++-var extend = require('xtend')
+++var extend = require('extend')
++ var statusCodes = require('builtin-status-codes')
++ var url = require('url')
++ 
++diff --git a/package.json b/package.json
++index 06f9fc7..edf0589 100644
++--- a/package.json
+++++ b/package.json
++@@ -31,7 +31,7 @@
++     "inherits": "^2.0.1",
++     "readable-stream": "^2.2.6",
++     "to-arraybuffer": "^1.0.0",
++-    "xtend": "^4.0.0"
+++    "extend": "^2.0.0"
++   },
++   "devDependencies": {
++     "basic-auth": "^1.0.3",
diff --cc debian/patches/series
index 0000000,0000000..20647bf
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-extend-instead-of-xtend.patch

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