[Pkg-javascript-commits] [node-ast-util] 07/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 42c666e1695950fec21e9db014787c2c88c2fb54
Merge: 4ca6275 12144c3
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Tue Oct 20 08:18:43 2015 +0200

    merge patched into master

 debian/.git-dpm                                       |  4 ++--
 .../0002-Adapt-the-example-to-Debian-too.patch        | 19 +++++++++++++++++++
 debian/patches/series                                 |  1 +
 examples/swap-macro.js                                |  2 +-
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index a91e094,0000000..11c2f14
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
- 766efee523180607f3728efe44aadeabb0635509
- 766efee523180607f3728efe44aadeabb0635509
++12144c32a11b409ca4f2b955db7b15fd141c5b3a
++12144c32a11b409ca4f2b955db7b15fd141c5b3a
 +d8fc2ee1c50471ae9462a9792c3d966397316d79
 +d8fc2ee1c50471ae9462a9792c3d966397316d79
 +node-ast-util_0.6.0.orig.tar.gz
 +b06b225f9d4f9668c0dd0d035da0e9b2ad83e9a8
 +17141
diff --cc debian/patches/0002-Adapt-the-example-to-Debian-too.patch
index 0000000,0000000..65056a7
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Adapt-the-example-to-Debian-too.patch
@@@ -1,0 -1,0 +1,19 @@@
++From 12144c32a11b409ca4f2b955db7b15fd141c5b3a Mon Sep 17 00:00:00 2001
++From: Julien Puydt <julien.puydt at laposte.net>
++Date: Tue, 20 Oct 2015 08:18:40 +0200
++Subject: Adapt the example to Debian too
++
++---
++ examples/swap-macro.js | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/examples/swap-macro.js b/examples/swap-macro.js
++index 201d540..b04e719 100755
++--- a/examples/swap-macro.js
+++++ b/examples/swap-macro.js
++@@ -1,4 +1,4 @@
++-#!/usr/bin/env node
+++#!/usr/bin/nodejs
++ 
++ var recast = require('recast');
++ var util = require('../lib');
diff --cc debian/patches/series
index ea68b08,0000000..43ff54a
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Adapt-the-builder-to-Debian-use-nodejs.patch
++0002-Adapt-the-example-to-Debian-too.patch

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