[Pkg-javascript-commits] [node-browserify-zlib] 48/50: 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-browserify-zlib.

commit ad97bf2b90d306002226e71be23851d035a7f7b3
Merge: 14f3481 065aba8
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Fri Dec 15 12:59:44 2017 +0100

    merge patched into master

 debian/.git-dpm                         |  4 ++--
 debian/patches/0001-Fix-testsuite.patch | 25 +++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 test/test-zlib-write-after-flush.js     |  2 +-
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 357050d,0000000..07b0902
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
- e0f9d00acd24b8e39bd6ef17810909b484a4145d
- e0f9d00acd24b8e39bd6ef17810909b484a4145d
++065aba84e932f2774262985fd1cae83c254469e5
++065aba84e932f2774262985fd1cae83c254469e5
 +e0f9d00acd24b8e39bd6ef17810909b484a4145d
 +e0f9d00acd24b8e39bd6ef17810909b484a4145d
 +node-browserify-zlib_0.2.0+20170820git8b3f0a862f6b+dfsg.orig.tar.xz
 +33f6d88d528bbf4cd0f95099e5e46a2dfe24f8e9
 +19380
diff --cc debian/patches/0001-Fix-testsuite.patch
index 0000000,0000000..2914708
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-testsuite.patch
@@@ -1,0 -1,0 +1,25 @@@
++From 065aba84e932f2774262985fd1cae83c254469e5 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Fri, 15 Dec 2017 12:59:21 +0100
++Subject: Fix testsuite
++
++Fix testsuite by not printing something
++
++Forwarded: no
++---
++ test/test-zlib-write-after-flush.js | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/test/test-zlib-write-after-flush.js b/test/test-zlib-write-after-flush.js
++index 2ab74be..652c8b4 100755
++--- a/test/test-zlib-write-after-flush.js
+++++ b/test/test-zlib-write-after-flush.js
++@@ -21,7 +21,7 @@ process.on('exit', function() {
++   // Make sure that the flush flag was set back to normal
++   assert.equal(gzip._flushFlag, zlib.Z_NO_FLUSH);
++ 
++-  console.log('ok');
+++  //console.log('ok');
++ });
++ 
++ // make sure that flush/write doesn't trigger an assert failure
diff --cc debian/patches/series
index 0000000,0000000..f9b63bc
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Fix-testsuite.patch

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