[Pkg-javascript-commits] [node-stack-utils] 62/67: 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-stack-utils.

commit 6057d7d608e38b836f8a6dd1cc6fbd6ddcc69b26
Merge: 654a73c 333a7ae
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Mon Aug 21 16:57:24 2017 +0200

    merge patched into master

 .editorconfig                                      |   2 +-
 .travis.yml                                        |   9 +
 appveyor.yml                                       |  23 ++
 debian/.git-dpm                                    |   6 +-
 ...001-Use-lodash.flatten-instead-of-flatten.patch |   2 +-
 index.js                                           |  73 +++++--
 package.json                                       |   9 +-
 test/at.js                                         |  24 +++
 test/fixtures/generate-parse-fixture.js            | 206 ++++++++++++++++++
 test/fixtures/parse-fixture.json                   | 237 +++++++++++++++++++++
 test/long-stack-traces.js                          | 176 +++++++--------
 test/parse-line-fixtures.js                        |  12 ++
 test/test.js                                       | 206 +++++++++---------
 13 files changed, 781 insertions(+), 204 deletions(-)

diff --cc debian/.git-dpm
index aec20c3,0000000..aea16d2
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
- d54d53f6159bca565431c573426c85237a14ed9a
- d54d53f6159bca565431c573426c85237a14ed9a
- e5e0e5e7a9f3de4e0aac49879f47b21e8172abb5
++333a7aeea0139006466d3e37cd784f165deb3f00
++333a7aeea0139006466d3e37cd784f165deb3f00
++d721bd3064a055209029f6a2cf1d01b339ffb290
 +d721bd3064a055209029f6a2cf1d01b339ffb290
 +node-stack-utils_1.0.1.orig.tar.gz
 +ff4244e145ddaae1b979d1cc2c4a0f72646fea17
 +12659
diff --cc debian/patches/0001-Use-lodash.flatten-instead-of-flatten.patch
index 28d4e2d,0000000..c7fe8b9
mode 100644,000000..100644
--- a/debian/patches/0001-Use-lodash.flatten-instead-of-flatten.patch
+++ b/debian/patches/0001-Use-lodash.flatten-instead-of-flatten.patch
@@@ -1,20 -1,0 +1,20 @@@
- From d54d53f6159bca565431c573426c85237a14ed9a Mon Sep 17 00:00:00 2001
++From 333a7aeea0139006466d3e37cd784f165deb3f00 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 16:50:23 +0200
 +Subject: Use lodash.flatten instead of flatten
 +
 +Forwarded: no
 +---
 + test/_utils.js | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/test/_utils.js b/test/_utils.js
 +index b80c7e7..ba0d282 100644
 +--- a/test/_utils.js
 ++++ b/test/_utils.js
 +@@ -1,4 +1,4 @@
 +-var flatten = require('flatten');
 ++var flatten = require('lodash.flatten');
 + var path = require('path');
 + 
 + module.exports.join = join;

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