[Pkg-javascript-commits] [node-tap] 145/186: 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-tap.

commit b4e7013d06f9e12b93f1880a26a10db8f91274d8
Merge: f2372bb 8b79cd7
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Fri Dec 1 16:32:47 2017 +0100

    merge patched into master

 debian/.git-dpm                           |  4 +-
 debian/patches/0012-Remove-minipass.patch | 62 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 lib/base.js                               |  2 +-
 package.json                              |  1 -
 test/stdin.js                             |  2 +-
 test/test.js                              |  2 +-
 7 files changed, 68 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 68384e7,0000000..c569c3a
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,16 -1,0 +1,16 @@@
 +# see git-dpm(1) from git-dpm package
- 4ddade94561408d4a05d33255fd26ab144ba949d
- 4ddade94561408d4a05d33255fd26ab144ba949d
++8b79cd765e21117ba53c389bcbe38e0ddd3417c9
++8b79cd765e21117ba53c389bcbe38e0ddd3417c9
 +4e308b15bb671b9b0aff67f3ac19957e4764a578
 +4e308b15bb671b9b0aff67f3ac19957e4764a578
 +node-tap_11.0.0+ds1.orig.tar.gz
 +a966e402d2576793be990eb4e19de6db3b2ff98c
 +142580
 +component:522a8693bbe5af81223646d1122b3c8c10d6c430:14390:node-tap_11.0.0+ds1.orig-module-bind-obj-methods.tar.gz
 +component:cf25554ca050dc49ae6656b41de42258989dcbce:1047:node-tap_11.0.0+ds1.orig-module-fs-exists-cached.tar.gz
 +component:696c8dcd7c39b57a271e7652f8155c4aca24f653:1813:node-tap_11.0.0+ds1.orig-module-function-loop.tar.gz
 +component:9ef920fc81e2e63cf59d41101258368cf4fca4fb:1571:node-tap_11.0.0+ds1.orig-module-own-or-env.tar.gz
 +component:4e877fbeda9a2ec8000fbc0bcae39645ee8bf8dc:1333:node-tap_11.0.0+ds1.orig-module-own-or.tar.gz
 +component:078874f788e3463819aababb8397ce021adbfa1a:1566:node-tap_11.0.0+ds1.orig-module-trivial-deferred.tar.gz
 +component:a200ae8bf612dae9e7aa5a81c69d43ab9dd1e5a8:14855:node-tap_11.0.0+ds1.orig-module-tsame.tar.gz
 +component:f693f29a315b50d9a9da2646a7a6645c96985b6a:1882:node-tap_11.0.0+ds1.orig-module-yapool.tar.gz
diff --cc debian/patches/0012-Remove-minipass.patch
index 0000000,0000000..237eb11
new file mode 100644
--- /dev/null
+++ b/debian/patches/0012-Remove-minipass.patch
@@@ -1,0 -1,0 +1,62 @@@
++From 8b79cd765e21117ba53c389bcbe38e0ddd3417c9 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Fri, 1 Dec 2017 16:32:04 +0100
++Subject: Remove minipass
++
++Forwarded: no
++---
++ lib/base.js   | 2 +-
++ package.json  | 1 -
++ test/stdin.js | 2 +-
++ test/test.js  | 2 +-
++ 4 files changed, 3 insertions(+), 4 deletions(-)
++
++diff --git a/lib/base.js b/lib/base.js
++index 8c32cb7..86cafb4 100644
++--- a/lib/base.js
+++++ b/lib/base.js
++@@ -1,6 +1,6 @@
++ 'use strict'
++ 
++-const MiniPass = require('minipass')
+++const MiniPass = require('stream').PassThrough
++ 
++ const extraFromError = require('./extra-from-error.js')
++ const assert = require('assert')
++diff --git a/package.json b/package.json
++index 82a7aab..50a5203 100644
++--- a/package.json
+++++ b/package.json
++@@ -22,7 +22,6 @@
++     "glob": "^7.0.0",
++     "isexe": "^2.0.0",
++     "js-yaml": "^3.10.0",
++-    "minipass": "^2.2.1",
++     "mkdirp": "^0.5.1",
++     "own-or": "^1.0.0",
++     "own-or-env": "^1.0.0",
++diff --git a/test/stdin.js b/test/stdin.js
++index c0d3ef7..16518af 100644
++--- a/test/stdin.js
+++++ b/test/stdin.js
++@@ -1,6 +1,6 @@
++ const t = require('../')
++ const Stdin = require('../lib/stdin.js')
++-const MP = require('minipass')
+++const MP = require('stream').PassThrough
++ 
++ process.env.TAP_BAIL = ''
++ process.env.TAP_BUFFER = ''
++diff --git a/test/test.js b/test/test.js
++index 1be4f1f..b160171 100644
++--- a/test/test.js
+++++ b/test/test.js
++@@ -6,7 +6,7 @@ const Test = t.Test
++ const util = require('util')
++ const assert = require('assert')
++ const EE = require('events').EventEmitter
++-const MiniPass = require('minipass')
+++const MiniPass = require('stream').PassThrough
++ 
++ // set this forcibly so it doesn't interfere with other tests.
++ process.env.TAP_DIAG = ''
diff --cc debian/patches/series
index 12dc6fe,0000000..8030bde
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,11 -1,0 +1,12 @@@
 +0001-Opener-could-be-optional.patch
 +0002-Replace-color-support-by-supports-color.patch
 +0003-Render-nyc-optional.patch
 +0004-Do-not-use-osHomedir.patch
 +0005-Bluebird-is-not-required.patch
 +0006-Skip-test-related-to-coverage.patch
 +0007-Remove-test-that-fail-due-to-timing.patch
 +0008-Disable-a-test-that-fail.patch
 +0009-Do-not-use-module-touch.patch
 +0010-Use-built-tap.patch
 +0011-Disable-bluebird-for-stack.patch
++0012-Remove-minipass.patch

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