[Pkg-javascript-commits] [node-jsesc] 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-jsesc.

commit c48ca40040ce4c7a8eb1b2b745ceb181ea15da06
Merge: 9f6f0d0 af6f774
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Fri Oct 16 16:27:14 2015 +0200

    merge patched into master

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

diff --cc debian/.git-dpm
index 84ac0db,0000000..983f044
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 55fcfc745c82b42421bd8e8196bda19ac9525d21
- 55fcfc745c82b42421bd8e8196bda19ac9525d21
++af6f774f60e236a52df7bbc391b5c3bd9ff3aa0d
++af6f774f60e236a52df7bbc391b5c3bd9ff3aa0d
 +55fcfc745c82b42421bd8e8196bda19ac9525d21
 +55fcfc745c82b42421bd8e8196bda19ac9525d21
 +node-jsesc_0.5.0.orig.tar.gz
 +951a88304ecf757b96fc86b30c6d35b94dc6a0a1
 +15172
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-On-Debian-node-is-nodejs.patch
index 0000000,0000000..c38ebd6
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-On-Debian-node-is-nodejs.patch
@@@ -1,0 -1,0 +1,19 @@@
++From af6f774f60e236a52df7bbc391b5c3bd9ff3aa0d Mon Sep 17 00:00:00 2001
++From: Julien Puydt <julien.puydt at laposte.net>
++Date: Fri, 16 Oct 2015 16:27:11 +0200
++Subject: On Debian, node is nodejs
++
++---
++ bin/jsesc | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/bin/jsesc b/bin/jsesc
++index 5900dd4..811a95f 100755
++--- a/bin/jsesc
+++++ b/bin/jsesc
++@@ -1,4 +1,4 @@
++-#!/usr/bin/env node
+++#!/usr/bin/nodejs
++ (function() {
++ 
++ 	var fs = require('fs');
diff --cc debian/patches/series
index 0000000,0000000..5a4c258
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-On-Debian-node-is-nodejs.patch

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