[Pkg-javascript-commits] [node-tap-mocha-reporter] 117/137: 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-mocha-reporter.

commit ec4c071c19a001cbad66b08ed4b0674167cf70fd
Merge: 620b29f b2a53e8
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Mon Aug 21 23:11:54 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...e-supports-color-instead-of-color-support.patch | 51 ++++++++++++++++++++++
 .../0002-Remove-depends-unicode-length.patch       | 41 +++++++++++++++++
 debian/patches/series                              |  2 +
 lib/reporters/base.js                              |  2 +-
 lib/reporters/classic.js                           |  5 ++-
 package.json                                       |  3 +-
 7 files changed, 101 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index fc067fa,0000000..a7d7fab
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
- 53e3b9e5adee4456fa850592cf7241797bc125e2
- 53e3b9e5adee4456fa850592cf7241797bc125e2
++b2a53e8c98c0216201252570c913338921e93ab6
++b2a53e8c98c0216201252570c913338921e93ab6
 +53e3b9e5adee4456fa850592cf7241797bc125e2
 +53e3b9e5adee4456fa850592cf7241797bc125e2
 +node-tap-mocha-reporter_3.0.6.orig.tar.gz
 +b3ac9908f45905ef7b69fbfa1e27ca50e549c384
 +38824
diff --cc debian/patches/0001-Use-supports-color-instead-of-color-support.patch
index 0000000,0000000..06a76f5
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-supports-color-instead-of-color-support.patch
@@@ -1,0 -1,0 +1,51 @@@
++From 5fc1a3dd703e8299d11937605f3026b6e2536b8c Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Mon, 21 Aug 2017 23:05:09 +0200
++Subject: Use supports-color instead of color-support
++
++Forwarded: no
++---
++ lib/reporters/base.js    | 2 +-
++ lib/reporters/classic.js | 2 +-
++ package.json             | 2 +-
++ 3 files changed, 3 insertions(+), 3 deletions(-)
++
++diff --git a/lib/reporters/base.js b/lib/reporters/base.js
++index 433d6c8..f6cae45 100644
++--- a/lib/reporters/base.js
+++++ b/lib/reporters/base.js
++@@ -6,7 +6,7 @@ var tty = require('tty')
++   , diff = require('diff')
++   , ms = require('../ms')
++   , utils = require('../utils')
++-  , supportsColor = require('color-support')()
+++  , supportsColor = require('supports-color')
++ 
++ /**
++  * Save timer references to avoid Sinon interfering (see GH-237).
++diff --git a/lib/reporters/classic.js b/lib/reporters/classic.js
++index e58e91a..2545227 100644
++--- a/lib/reporters/classic.js
+++++ b/lib/reporters/classic.js
++@@ -10,7 +10,7 @@ var Base = require('./base')
++   , diff = require('diff')
++   , utils = require('../utils.js')
++   , uclen = require('unicode-length').get
++-  , colorSupport = require('color-support')()
+++  , colorSupport = require('supports-color')
++ 
++ function repeat (n, c) {
++   return new Array(Math.max(n + 1, 0)).join(c)
++diff --git a/package.json b/package.json
++index e831e10..d5d9dea 100644
++--- a/package.json
+++++ b/package.json
++@@ -17,7 +17,7 @@
++   },
++   "homepage": "https://github.com/isaacs/tap-mocha-reporter",
++   "dependencies": {
++-    "color-support": "^1.1.0",
+++    "support-colors": "^3.2",
++     "debug": "^2.1.3",
++     "diff": "^1.3.2",
++     "escape-string-regexp": "^1.0.3",
diff --cc debian/patches/0002-Remove-depends-unicode-length.patch
index 0000000,0000000..3fa91e0
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Remove-depends-unicode-length.patch
@@@ -1,0 -1,0 +1,41 @@@
++From b2a53e8c98c0216201252570c913338921e93ab6 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Mon, 21 Aug 2017 23:10:30 +0200
++Subject: Remove depends unicode-length
++
++Not totally correct but it will change something only for 14 characters.
++
++Will revise when unicode-length will be packaged
++
++Forwarded: no
++---
++ lib/reporters/classic.js | 3 ++-
++ package.json             | 1 -
++ 2 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/lib/reporters/classic.js b/lib/reporters/classic.js
++index 2545227..d87fec3 100644
++--- a/lib/reporters/classic.js
+++++ b/lib/reporters/classic.js
++@@ -9,7 +9,8 @@ var Base = require('./base')
++   , ms = require('../ms.js')
++   , diff = require('diff')
++   , utils = require('../utils.js')
++-  , uclen = require('unicode-length').get
+++  , stripAnsi = require('strip-ansi')
+++  , uclen = function(str) { return stripAnsi(str).length }
++   , colorSupport = require('supports-color')
++ 
++ function repeat (n, c) {
++diff --git a/package.json b/package.json
++index d5d9dea..20af6e8 100644
++--- a/package.json
+++++ b/package.json
++@@ -24,7 +24,6 @@
++     "glob": "^7.0.5",
++     "js-yaml": "^3.3.1",
++     "tap-parser": "^5.1.0",
++-    "unicode-length": "^1.0.0"
++   },
++   "devDependencies": {
++     "tap": "^6.2.0"
diff --cc debian/patches/series
index 0000000,0000000..db24669
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,2 @@@
++0001-Use-supports-color-instead-of-color-support.patch
++0002-Remove-depends-unicode-length.patch

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