[Pkg-javascript-commits] [node-stream-http] 202/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 ed5334b161137e90585ee4124f6f91b745d1ae59
Merge: 52690b9 e8363ed
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Mon Jun 12 22:17:19 2017 +0200

    merge patched into master

 debian/.git-dpm                                       |   6 +++---
 debian/patches/0001-Use-extend-instead-of-xtend.patch |   2 +-
 test/server/static/browserify.png                     | Bin 31422 -> 0 bytes
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index b1ba3af,0000000..b429c38
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
- 2c1320687c473cda1ae4a611094f3906fc4d9026
- 2c1320687c473cda1ae4a611094f3906fc4d9026
- 8eab4b3e5f0502ec6a2d7babc60b7b2ae8ebb17a
++e8363ed709b60cc55a4637e3ca5f940e243ac982
++e8363ed709b60cc55a4637e3ca5f940e243ac982
++add99fba705feeea9609ceff5faae6525fd651aa
 +add99fba705feeea9609ceff5faae6525fd651aa
 +node-stream-http_2.7.1+dfsg.orig.tar.gz
 +9753c60707174a42c029613316857fdad8b86ccc
 +17308
diff --cc debian/patches/0001-Use-extend-instead-of-xtend.patch
index 596a8b3,0000000..08db1a6
mode 100644,000000..100644
--- a/debian/patches/0001-Use-extend-instead-of-xtend.patch
+++ b/debian/patches/0001-Use-extend-instead-of-xtend.patch
@@@ -1,35 -1,0 +1,35 @@@
- From 2c1320687c473cda1ae4a611094f3906fc4d9026 Mon Sep 17 00:00:00 2001
++From e8363ed709b60cc55a4637e3ca5f940e243ac982 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",

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