[Pkg-javascript-commits] [node-foreground-child] 02/03: 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-foreground-child.

commit 47317137449919e41c95b3fcd33f7958ed17a24a
Merge: 4250e22 8dc4348
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Fri Sep 1 14:18:25 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...e-timeout-in-order-to-avoid-build-failure.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 test/immortal-child.js                             |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index ca36aeb,0000000..7443653
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
- b3b2184d8a933e983cf15bea25c98f4c67466737
- b3b2184d8a933e983cf15bea25c98f4c67466737
++8dc434889ad9d9df2e51c145109fc46a0e66bba3
++8dc434889ad9d9df2e51c145109fc46a0e66bba3
 +4243914e257079bf041574d84c0381cfce269ccc
 +4243914e257079bf041574d84c0381cfce269ccc
 +node-foreground-child_1.5.6.orig.tar.gz
 +8893a1b590efc6642bdb6ffdad26ab41cd8170fd
 +5859
diff --cc debian/patches/0002-Increase-timeout-in-order-to-avoid-build-failure.patch
index 0000000,0000000..2d79a1e
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Increase-timeout-in-order-to-avoid-build-failure.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 8dc434889ad9d9df2e51c145109fc46a0e66bba3 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Fri, 1 Sep 2017 14:08:50 +0200
++Subject: Increase timeout in order to avoid build failure
++
++forwarded: no
++---
++ test/immortal-child.js | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/test/immortal-child.js b/test/immortal-child.js
++index d66e057..b58e755 100644
++--- a/test/immortal-child.js
+++++ b/test/immortal-child.js
++@@ -38,7 +38,7 @@ function test () {
++     t.end()
++   })
++ 
++-  var time = 250
+++  var time = 250*4
++   // coverage slows things down a bit
++   if (process.env._TAP_COVERAGE_)
++     time = 1000
diff --cc debian/patches/series
index 015cc1a,0000000..5211230
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-package-does-not-need-tap-8.0.1-use-tap-8.0.0.patch
++0002-Increase-timeout-in-order-to-avoid-build-failure.patch

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