[Pkg-javascript-commits] [node-umd] 07/18: merge patched into master

[Bastien Roucariès]

This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to tag debian-3.0.1+ds-1
in repository node-umd.

commit de86511b8df436bc1dcd29d4e0c82f4c82a8a0fe
Merge: 75b12fd 13697ee
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Fri Apr 14 14:09:39 2017 +0200

    merge patched into master

 bin/cli.js                                           |  2 +-
 debian/.git-dpm                                      |  4 ++--
 debian/patches/0001-Use-nodejs-instead-of-node.patch | 20 ++++++++++++++++++++
 debian/patches/series                                |  1 +
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index d826314,0000000..3f4b09e
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
- bc7b4fdf61a9c8f7faebbd5f6128c911b2d43333
- bc7b4fdf61a9c8f7faebbd5f6128c911b2d43333
++13697ee1ae167a7bc50f7a71166de02b2431f15d
++13697ee1ae167a7bc50f7a71166de02b2431f15d
 +bc7b4fdf61a9c8f7faebbd5f6128c911b2d43333
 +bc7b4fdf61a9c8f7faebbd5f6128c911b2d43333
 +node-umd_3.0.1+ds.orig.tar.gz
 +d189346fa5e7d20ec28d78b3248960bf1e1759cc
 +26887
diff --cc debian/patches/0001-Use-nodejs-instead-of-node.patch
index 0000000,0000000..6163c9c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-nodejs-instead-of-node.patch
@@@ -1,0 -1,0 +1,20 @@@
++From 13697ee1ae167a7bc50f7a71166de02b2431f15d Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Fri, 14 Apr 2017 14:09:16 +0200
++Subject: Use nodejs instead of node
++
++Forwarded: no
++---
++ bin/cli.js | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/bin/cli.js b/bin/cli.js
++index 3a2287a..baadfd2 100644
++--- a/bin/cli.js
+++++ b/bin/cli.js
++@@ -1,4 +1,4 @@
++-#!/usr/bin/env node
+++#!/usr/bin/env nodejs
++ 
++ var read = require('fs').createReadStream
++ var write = require('fs').createWriteStream
diff --cc debian/patches/series
index 0000000,0000000..566e3a2
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-nodejs-instead-of-node.patch

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