[Pkg-javascript-commits] [node-es6-module-transpiler] 04/09: merge patched into master

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository node-es6-module-transpiler.

commit 8b7ad7baf74b87f0b7f7c42eea0d1e3311e81a5b
Merge: 9d3353b 2deb643
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Mon Oct 19 17:32:13 2015 +0200

    merge patched into master

 bin/compile-modules                                   |  2 +-
 debian/.git-dpm                                       |  4 ++--
 .../patches/0001-On-Debian-systems-use-nodejs.patch   | 19 +++++++++++++++++++
 debian/patches/series                                 |  1 +
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 69fb425,0000000..ab18bd5
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
- a279d996c70f1c441f40878f3a704461f7898fe5
- a279d996c70f1c441f40878f3a704461f7898fe5
++2deb6436267d32b2289a18c843fa8339a3be8364
++2deb6436267d32b2289a18c843fa8339a3be8364
 +a279d996c70f1c441f40878f3a704461f7898fe5
 +a279d996c70f1c441f40878f3a704461f7898fe5
 +node-es6-module-transpiler_0.10.0.orig.tar.gz
 +c7da79cf88fc011172c07eccee7d52f2b1078f82
 +42744
diff --cc debian/patches/0001-On-Debian-systems-use-nodejs.patch
index 0000000,0000000..4bb3471
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-On-Debian-systems-use-nodejs.patch
@@@ -1,0 -1,0 +1,19 @@@
++From 2deb6436267d32b2289a18c843fa8339a3be8364 Mon Sep 17 00:00:00 2001
++From: Julien Puydt <julien.puydt at laposte.net>
++Date: Mon, 19 Oct 2015 15:26:46 +0200
++Subject: On Debian systems, use nodejs
++
++---
++ bin/compile-modules | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/bin/compile-modules b/bin/compile-modules
++index 9c3f3d0..4069855 100755
++--- a/bin/compile-modules
+++++ b/bin/compile-modules
++@@ -1,4 +1,4 @@
++-#!/usr/bin/env node
+++#!/usr/bin/nodejs
++ 
++ var Path = require('path');
++ var exe = Path.basename(process.argv[1]);
diff --cc debian/patches/series
index 0000000,0000000..c5d5ca9
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-On-Debian-systems-use-nodejs.patch

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