[Pkg-javascript-commits] [node-mapnik] 02/06: Add patch to use nodejs instead of node executable.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository node-mapnik.

commit bf8ead1195edeeedadc17bafc16ec0d890e1b34b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Apr 8 13:18:20 2016 +0200

    Add patch to use nodejs instead of node executable.
---
 debian/changelog            |  1 +
 debian/patches/nodejs.patch | 46 +++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series       |  1 +
 debian/rules                |  5 ++---
 4 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 92471d0..0c76f9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ node-mapnik (3.5.8+dfsg-1) UNRELEASED; urgency=medium
     - Drop © character from copyright statements
     - Use stand-alone license paragraphs
   * Update watch file to handle common issues.
+  * Add patch to use nodejs instead of node executable.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 08 Apr 2016 10:45:50 +0200
 
diff --git a/debian/patches/nodejs.patch b/debian/patches/nodejs.patch
new file mode 100644
index 0000000..0b352fd
--- /dev/null
+++ b/debian/patches/nodejs.patch
@@ -0,0 +1,46 @@
+Description: Switch NodeJS command from node (upstream) to nodejs (Debian).
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/bin/mapnik-index.js
++++ b/bin/mapnik-index.js
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env node
++#!/usr/bin/nodejs
+ 
+ 'use strict';
+ 
+--- a/bin/mapnik-inspect.js
++++ b/bin/mapnik-inspect.js
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env node
++#!/usr/bin/nodejs
+ 
+ "use strict";
+ 
+--- a/bin/mapnik-render.js
++++ b/bin/mapnik-render.js
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env node
++#!/usr/bin/nodejs
+ 
+ "use strict";
+ 
+--- a/bin/mapnik-shapeindex.js
++++ b/bin/mapnik-shapeindex.js
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env node
++#!/usr/bin/nodejs
+ 
+ 'use strict';
+ 
+--- a/binding.gyp
++++ b/binding.gyp
+@@ -57,7 +57,7 @@
+         './deps/clipper/',
+         './node_modules/mapnik-vector-tile/src/',
+         './src',
+-        "<!(node -e \"require('nan')\")",
++        "<!(nodejs -e \"require('nan')\")",
+         './node_modules/protozero/include/',
+       ],
+       'defines': [
diff --git a/debian/patches/series b/debian/patches/series
index f7d5624..bf04208 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 test_disable_raster_layer.patch
+nodejs.patch
diff --git a/debian/rules b/debian/rules
index 56cdb09..bfe0d05 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,9 +12,8 @@ vector_tile_dir=$(CURDIR)/node_modules/mapnik-vector-tile/src
 override_dh_install:
 	dh_install
 	dh_buildinfo
-	for i in mapnik-inspect mapnik-render; do \
-		cp bin/$$i.js $(CURDIR)/debian/node-mapnik/usr/bin/$$i; \
-		sed -i "s@#!/usr/bin/env node@#!/usr/bin/nodejs at g" $(CURDIR)/debian/node-mapnik/usr/bin/$$i; \
+	for i in bin/*.js; do \
+		cp $$i $(CURDIR)/debian/node-mapnik/usr/bin/$(basename $ii .js); \
 	done
 	chmod 644 $(CURDIR)/debian/node-mapnik/usr/lib/nodejs/mapnik/lib/_mapnik.node
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/node-mapnik.git