[Pkg-javascript-commits] [node-es6-module-transpiler] 07/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 ca6e8d00fe556a459839d39499b4758a41e11482
Merge: d1d4dfe 281c923
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Mon Oct 19 22:25:27 2015 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0002-Workaround-for-upstream-issue-199.patch   | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 lib/module.js                                      |  6 ++++-
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index ab18bd5,0000000..33fd6c9
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
- 2deb6436267d32b2289a18c843fa8339a3be8364
- 2deb6436267d32b2289a18c843fa8339a3be8364
++281c92340088a1455493c7a82d47066c7153d041
++281c92340088a1455493c7a82d47066c7153d041
 +a279d996c70f1c441f40878f3a704461f7898fe5
 +a279d996c70f1c441f40878f3a704461f7898fe5
 +node-es6-module-transpiler_0.10.0.orig.tar.gz
 +c7da79cf88fc011172c07eccee7d52f2b1078f82
 +42744
diff --cc debian/patches/0002-Workaround-for-upstream-issue-199.patch
index 0000000,0000000..48b9548
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Workaround-for-upstream-issue-199.patch
@@@ -1,0 -1,0 +1,26 @@@
++From 281c92340088a1455493c7a82d47066c7153d041 Mon Sep 17 00:00:00 2001
++From: Julien Puydt <julien.puydt at laposte.net>
++Date: Mon, 19 Oct 2015 22:25:23 +0200
++Subject: Workaround for upstream issue 199
++
++---
++ lib/module.js | 6 +++++-
++ 1 file changed, 5 insertions(+), 1 deletion(-)
++
++diff --git a/lib/module.js b/lib/module.js
++index 96529c5..a659641 100644
++--- a/lib/module.js
+++++ b/lib/module.js
++@@ -136,7 +136,11 @@ memo(Module.prototype, 'ast', /** @this Module */function() {
++  * @name Module#src
++  */
++ memo(Module.prototype, 'src', /** @this Module */function() {
++-  return fs.readFileSync(this.path).toString();
+++  if (endsWith(this.path, '.js')) {
+++     return fs.readFileSync(this.path).toString();
+++  } else {
+++     return fs.readFileSync(this.path+'.js').toString();
+++  };
++ });
++ 
++ /**
diff --cc debian/patches/series
index c5d5ca9,0000000..06ba3f3
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-On-Debian-systems-use-nodejs.patch
++0002-Workaround-for-upstream-issue-199.patch

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