[Pkg-javascript-commits] [node-log-driver] 12/15: 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-log-driver.

commit 89787873130b9473f477113ebb88491f34f6d1a5
Merge: 4767fa9 3a3ed9e
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Thu Aug 24 22:43:58 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 debian/patches/0002-Fix-test-suite.patch           |  4 +++-
 ...ot-need-to-depends-on-coverage.io-service.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 package.json                                       |  1 -
 5 files changed, 28 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 8f4c3a2,0000000..5d9a17f
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
- 1d68724ff266449488ff00db4f640d31c7990cf4
- 1d68724ff266449488ff00db4f640d31c7990cf4
++3a3ed9ee990a9563c764d4835aab104cb40fbc26
++3a3ed9ee990a9563c764d4835aab104cb40fbc26
 +3a631e9b033112a06e73f46796739ad5d43c37e2
 +3a631e9b033112a06e73f46796739ad5d43c37e2
 +node-log-driver_1.2.5+2017301git8cfc1bf3f8f2fa38a3+dsfg.orig.tar.xz
 +5f0fcdfbb45f70ad40e67dbdd3b86fad57e5335d
 +17228
diff --cc debian/patches/0002-Fix-test-suite.patch
index bf06053,0000000..74ddf37
mode 100644,000000..100644
--- a/debian/patches/0002-Fix-test-suite.patch
+++ b/debian/patches/0002-Fix-test-suite.patch
@@@ -1,32 -1,0 +1,34 @@@
- From 1d68724ff266449488ff00db4f640d31c7990cf4 Mon Sep 17 00:00:00 2001
++From e4b7a157a7b4574a75a25a1ad895d4ca1ffa680c Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
 +Date: Thu, 24 Aug 2017 22:35:33 +0200
 +Subject: Fix test suite
 +
++Forwarded: yes
++bug: https://github.com/cainus/logdriver/issues/7
 +---
 + test/index.js | 12 ++++++------
 + 1 file changed, 6 insertions(+), 6 deletions(-)
 +
 +diff --git a/test/index.js b/test/index.js
 +index 7b5f3de..d631144 100644
 +--- a/test/index.js
 ++++ b/test/index.js
 +@@ -59,12 +59,12 @@ describe("logdriver", function(){
 +     mylogger.error("error test"); 
 +     mylogger.trace("trace test"); 
 +     var lines = logged.split("\n");
 +-    lines[0].should.include('[info]');
 +-    lines[1].should.include('[warn]');
 +-    lines[2].should.include('[error]');
 +-    lines[0].should.include('info test');
 +-    lines[1].should.include('warn test');
 +-    lines[2].should.include('error test');
 ++    should.ok(lines[0].includes('[info]'));
 ++    should.ok(lines[1].includes('[warn]'));
 ++    should.ok(lines[2].includes('[error]'));
 ++    should.ok(lines[0].includes('info test'));
 ++    should.ok(lines[1].includes('warn test'));
 ++    should.ok(lines[2].includes('error test'));
 + 
 +   });
 + 
diff --cc debian/patches/0003-Do-not-need-to-depends-on-coverage.io-service.patch
index 0000000,0000000..7de9630
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Do-not-need-to-depends-on-coverage.io-service.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 3a3ed9ee990a9563c764d4835aab104cb40fbc26 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Thu, 24 Aug 2017 22:42:31 +0200
++Subject: Do not need to depends on coverage.io service
++
++Forwarded: no
++---
++ package.json | 1 -
++ 1 file changed, 1 deletion(-)
++
++diff --git a/package.json b/package.json
++index 905dedf..4575cf4 100644
++--- a/package.json
+++++ b/package.json
++@@ -21,7 +21,6 @@
++     "Gregg Caines <gregg at caines.ca> (http://caines.ca)"
++   ],
++   "dependencies": {
++-    "codecov.io": "0.0.1"
++   },
++   "devDependencies": {
++     "jshint": "2.4.4",
diff --cc debian/patches/series
index 4ff45a3,0000000..29ddabf
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-Use-sinon-instead-of-sinon-restore.patch
 +0002-Fix-test-suite.patch
++0003-Do-not-need-to-depends-on-coverage.io-service.patch

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