[Pkg-javascript-commits] [node-ast-util] 05/08: 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-ast-util.

commit 4ca6275992b06cbc0e285f0aeec84cfbd6cb8219
Merge: f1b72d5 766efee
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Mon Oct 19 12:53:08 2015 +0200

    merge patched into master

 bin/make-builder                                      |  2 +-
 debian/.git-dpm                                       |  4 ++--
 .../0001-Adapt-the-builder-to-Debian-use-nodejs.patch | 19 +++++++++++++++++++
 debian/patches/series                                 |  1 +
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 5471177,0000000..a91e094
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
- d8fc2ee1c50471ae9462a9792c3d966397316d79
- d8fc2ee1c50471ae9462a9792c3d966397316d79
++766efee523180607f3728efe44aadeabb0635509
++766efee523180607f3728efe44aadeabb0635509
 +d8fc2ee1c50471ae9462a9792c3d966397316d79
 +d8fc2ee1c50471ae9462a9792c3d966397316d79
 +node-ast-util_0.6.0.orig.tar.gz
 +b06b225f9d4f9668c0dd0d035da0e9b2ad83e9a8
 +17141
diff --cc debian/patches/0001-Adapt-the-builder-to-Debian-use-nodejs.patch
index 0000000,0000000..a909ee5
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Adapt-the-builder-to-Debian-use-nodejs.patch
@@@ -1,0 -1,0 +1,19 @@@
++From 766efee523180607f3728efe44aadeabb0635509 Mon Sep 17 00:00:00 2001
++From: Julien Puydt <julien.puydt at laposte.net>
++Date: Mon, 19 Oct 2015 12:02:50 +0200
++Subject: Adapt the builder to Debian: use nodejs
++
++---
++ bin/make-builder | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/bin/make-builder b/bin/make-builder
++index 7a71359..41f69b3 100755
++--- a/bin/make-builder
+++++ b/bin/make-builder
++@@ -1,4 +1,4 @@
++-#!/usr/bin/env node
+++#!/usr/bin/nodejs
++ 
++ /* jshint node:true, unused:true, undef:true */
++ 
diff --cc debian/patches/series
index 0000000,0000000..ea68b08
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Adapt-the-builder-to-Debian-use-nodejs.patch

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