[Pkg-javascript-commits] [node-parents] 24/29: 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-parents.

commit d52226e74b1bee446c4b49737e198059e640779c
Merge: 9500684 5ed7faa
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Fri Aug 18 00:26:05 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../0001-Do-not-depend-on-path-plateform.patch     | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 index.js                                           |  2 +-
 package.json                                       |  1 -
 5 files changed, 39 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 4afe2cd,0000000..834f717
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
- 1a90e0b70695f08e3eab32be2f1a867b4bbe6880
- 1a90e0b70695f08e3eab32be2f1a867b4bbe6880
++5ed7faaa1992a4787b9c477c5dbff79867582808
++5ed7faaa1992a4787b9c477c5dbff79867582808
 +1a90e0b70695f08e3eab32be2f1a867b4bbe6880
 +1a90e0b70695f08e3eab32be2f1a867b4bbe6880
 +node-parents_1.0.1.orig.tar.gz
 +34a2eba859ae4238bb9f3b6f5a04efdf6f88d8b4
 +2880
diff --cc debian/patches/0001-Do-not-depend-on-path-plateform.patch
index 0000000,0000000..fc08722
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Do-not-depend-on-path-plateform.patch
@@@ -1,0 -1,0 +1,35 @@@
++From 5ed7faaa1992a4787b9c477c5dbff79867582808 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Fri, 18 Aug 2017 00:25:35 +0200
++Subject: Do not depend on path-plateform
++
++Use an hard depend on nodejs > 4 and depends on path
++
++Forwarded: no
++---
++ index.js     | 2 +-
++ package.json | 1 -
++ 2 files changed, 1 insertion(+), 2 deletions(-)
++
++diff --git a/index.js b/index.js
++index 84a9639..ba25a49 100644
++--- a/index.js
+++++ b/index.js
++@@ -1,4 +1,4 @@
++-var pathPlatform = require('path-platform');
+++var pathPlatform = require('path');
++ 
++ module.exports = function (cwd, opts) {
++     if (cwd === undefined) cwd = process.cwd();
++diff --git a/package.json b/package.json
++index 5f6814c..47e7bb5 100644
++--- a/package.json
+++++ b/package.json
++@@ -9,7 +9,6 @@
++         "test" : "test"
++     },
++     "dependencies" : {
++-        "path-platform": "~0.11.15"
++     },
++     "devDependencies" : {
++         "tap" : "~0.2.5"
diff --cc debian/patches/series
index 0000000,0000000..0ed9c41
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Do-not-depend-on-path-plateform.patch

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