[Pkg-javascript-commits] [node-esprima-fb] 05/06: 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-esprima-fb.

commit 2fdf379c4076a7bb385402fa63d6607aaf771200
Merge: 6e963f3 b1b26a8
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Sun Oct 18 22:42:14 2015 +0200

    merge patched into master

 bin/esparse.js                                     |  4 +--
 bin/esvalidate.js                                  |  4 +--
 debian/.git-dpm                                    |  4 +--
 debian/patches/0001-On-Debian-node-is-nodejs.patch | 30 ++++++++++++++++++
 ...ripts-stop-requiring-esprima-fb-as-just-e.patch | 36 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 6 files changed, 74 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index f51ba28,0000000..f90b297
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
- 9817ac9b1ac34fd5e0cf5b93651dec423338f36d
- 9817ac9b1ac34fd5e0cf5b93651dec423338f36d
++b1b26a8990a1c8cdb5d124974d18409720dcb0d6
++b1b26a8990a1c8cdb5d124974d18409720dcb0d6
 +9817ac9b1ac34fd5e0cf5b93651dec423338f36d
 +9817ac9b1ac34fd5e0cf5b93651dec423338f36d
 +node-esprima-fb_15001.1001.0-dev-harmony-fb.orig.tar.gz
 +236cc46e4ddb269dcfc1c889b3c6a9872fe71495
 +856546
diff --cc debian/patches/0001-On-Debian-node-is-nodejs.patch
index 0000000,0000000..b301207
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-On-Debian-node-is-nodejs.patch
@@@ -1,0 -1,0 +1,30 @@@
++From b7a9356465f9bc9744add61aac8a8f6bc6adbc17 Mon Sep 17 00:00:00 2001
++From: Julien Puydt <julien.puydt at laposte.net>
++Date: Sun, 18 Oct 2015 18:48:16 +0200
++Subject: On Debian, node is nodejs
++
++---
++ bin/esparse.js    | 2 +-
++ bin/esvalidate.js | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/bin/esparse.js b/bin/esparse.js
++index 3e7bb81..1727e2f 100755
++--- a/bin/esparse.js
+++++ b/bin/esparse.js
++@@ -1,4 +1,4 @@
++-#!/usr/bin/env node
+++#!/usr/bin/nodejs
++ /*
++   Copyright (C) 2012 Ariya Hidayat <ariya.hidayat at gmail.com>
++   Copyright (C) 2011 Ariya Hidayat <ariya.hidayat at gmail.com>
++diff --git a/bin/esvalidate.js b/bin/esvalidate.js
++index dddd8a2..d1dcab9 100755
++--- a/bin/esvalidate.js
+++++ b/bin/esvalidate.js
++@@ -1,4 +1,4 @@
++-#!/usr/bin/env node
+++#!/usr/bin/nodejs
++ /*
++   Copyright (C) 2012 Ariya Hidayat <ariya.hidayat at gmail.com>
++ 
diff --cc debian/patches/0002-Make-the-scripts-stop-requiring-esprima-fb-as-just-e.patch
index 0000000,0000000..5df2de9
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Make-the-scripts-stop-requiring-esprima-fb-as-just-e.patch
@@@ -1,0 -1,0 +1,36 @@@
++From b1b26a8990a1c8cdb5d124974d18409720dcb0d6 Mon Sep 17 00:00:00 2001
++From: Julien Puydt <julien.puydt at laposte.net>
++Date: Sun, 18 Oct 2015 22:29:35 +0200
++Subject: Make the scripts stop requiring esprima-fb as just esprima
++
++---
++ bin/esparse.js    | 2 +-
++ bin/esvalidate.js | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/bin/esparse.js b/bin/esparse.js
++index 1727e2f..bd25942 100755
++--- a/bin/esparse.js
+++++ b/bin/esparse.js
++@@ -30,7 +30,7 @@ var fs, esprima, fname, content, options, syntax;
++ 
++ if (typeof require === 'function') {
++     fs = require('fs');
++-    esprima = require('esprima');
+++    esprima = require('esprima-fb');
++ } else if (typeof load === 'function') {
++     try {
++         load('esprima.js');
++diff --git a/bin/esvalidate.js b/bin/esvalidate.js
++index d1dcab9..3ba3d57 100755
++--- a/bin/esvalidate.js
+++++ b/bin/esvalidate.js
++@@ -36,7 +36,7 @@ if (typeof esprima === 'undefined') {
++         esprima = require('./esprima');
++     } else if (typeof require === 'function') {
++         fs = require('fs');
++-        esprima = require('esprima');
+++        esprima = require('esprima-fb');
++     } else if (typeof load === 'function') {
++         try {
++             load('esprima.js');
diff --cc debian/patches/series
index 0000000,0000000..ea61112
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,2 @@@
++0001-On-Debian-node-is-nodejs.patch
++0002-Make-the-scripts-stop-requiring-esprima-fb-as-just-e.patch

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