[Pkg-javascript-commits] [node-stack-utils] 57/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 42f898b8bebb779a640f78a176de8be48f3bada7
Merge: ed0578b d54d53f
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Mon Aug 21 16:50:53 2017 +0200

    merge patched into master

 debian/.git-dpm                                      |  4 ++--
 .../0001-Use-lodash.flatten-instead-of-flatten.patch | 20 ++++++++++++++++++++
 debian/patches/series                                |  1 +
 test/_utils.js                                       |  2 +-
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 318b708,0000000..3b97920
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
- e5e0e5e7a9f3de4e0aac49879f47b21e8172abb5
- e5e0e5e7a9f3de4e0aac49879f47b21e8172abb5
++d54d53f6159bca565431c573426c85237a14ed9a
++d54d53f6159bca565431c573426c85237a14ed9a
 +e5e0e5e7a9f3de4e0aac49879f47b21e8172abb5
 +e5e0e5e7a9f3de4e0aac49879f47b21e8172abb5
 +node-stack-utils_1.0.1.orig.tar.gz
 +ff4244e145ddaae1b979d1cc2c4a0f72646fea17
 +12659
diff --cc debian/patches/0001-Use-lodash.flatten-instead-of-flatten.patch
index 0000000,0000000..28d4e2d
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-lodash.flatten-instead-of-flatten.patch
@@@ -1,0 -1,0 +1,20 @@@
++From d54d53f6159bca565431c573426c85237a14ed9a 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;
diff --cc debian/patches/series
index 0000000,0000000..1d8c108
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-lodash.flatten-instead-of-flatten.patch

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