[Pkg-javascript-commits] [node-tap] 172/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 ceb42ea70db9137130d7794db845802891dfdba3
Merge: 4ed2ba5 13cf264
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Fri Dec 1 16:40:49 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 debian/patches/0011-Disable-bluebird-on-test.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 lib/test.js                                        |  1 -
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 19f8c56,0000000..2dcfaf5
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
- ced1de0e4edf987aa9aec15a88561401ec37b048
- ced1de0e4edf987aa9aec15a88561401ec37b048
++13cf26473747acdd3c559245e3e232929b22a2c0
++13cf26473747acdd3c559245e3e232929b22a2c0
 +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/0011-Disable-bluebird-on-test.patch
index 0000000,0000000..1daaebd
new file mode 100644
--- /dev/null
+++ b/debian/patches/0011-Disable-bluebird-on-test.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 13cf26473747acdd3c559245e3e232929b22a2c0 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:40:36 +0100
++Subject: Disable bluebird on test
++
++Forwarded: no
++---
++ lib/test.js | 1 -
++ 1 file changed, 1 deletion(-)
++
++diff --git a/lib/test.js b/lib/test.js
++index 9968af4..f5a3d84 100644
++--- a/lib/test.js
+++++ b/lib/test.js
++@@ -36,7 +36,6 @@ const assert = require('assert')
++ const util = require('util')
++ const ownOr = require('own-or')
++ const ownOrEnv = require('own-or-env')
++-const Promise = require('bluebird')
++ const bindObj = require('bind-obj-methods')
++ const cwd = process.cwd()
++ 
diff --cc debian/patches/series
index d02a612,0000000..2811c46
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,10 -1,0 +1,11 @@@
 +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-Remove-test-that-fail-due-to-timing.patch
 +0006-Disable-a-test-that-fail.patch
 +0007-Do-not-use-module-touch.patch
 +0008-Use-built-tap.patch
 +0009-Disable-bluebird-for-stack.patch
 +0010-Remove-minipass.patch
++0011-Disable-bluebird-on-test.patch

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