[Pkg-javascript-commits] [node-mapnik] 02/03: Add patch to not require node-pre-gyp in executables.

[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 d039e58c4d132eadae4d856ae4605c6901a087a8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Apr 8 14:16:26 2016 +0200

    Add patch to not require node-pre-gyp in executables.
---
 debian/changelog                  |  1 +
 debian/patches/node-pre-gyp.patch | 32 ++++++++++++++++++++++++++++++++
 debian/patches/nodejs.patch       |  1 +
 debian/patches/series             |  1 +
 4 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 97f1df6..a9ed6a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ node-mapnik (3.5.8+dfsg-1) UNRELEASED; urgency=medium
   * Reorder (build) dependencies and add node-nan to build dependencies.
   * Require at least libmapnik-dev 3.0.10 & mapnik-vector-tile 1.0.6+dfsg-2.
   * Copy all mapnik-vector-tile headers to build directory.
+  * Add patch to not require node-pre-gyp in executables.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 08 Apr 2016 10:45:50 +0200
 
diff --git a/debian/patches/node-pre-gyp.patch b/debian/patches/node-pre-gyp.patch
new file mode 100644
index 0000000..d970926
--- /dev/null
+++ b/debian/patches/node-pre-gyp.patch
@@ -0,0 +1,32 @@
+Description: Don't require node-pre-gyp.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/bin/mapnik-index.js
++++ b/bin/mapnik-index.js
+@@ -2,10 +2,7 @@
+ 
+ 'use strict';
+ 
+-var binary = require('node-pre-gyp'),
+-    path = require('path'),
+-    bindingPath = binary.find(path.resolve(__dirname, '..', 'package.json')),
+-    program = path.join(path.dirname(bindingPath), 'mapnik-index'),
++var program = '/usr/bin/mapnik-index',
+     spawn = require('child_process').spawn,
+     fs = require('fs');
+ 
+--- a/bin/mapnik-shapeindex.js
++++ b/bin/mapnik-shapeindex.js
+@@ -2,10 +2,7 @@
+ 
+ 'use strict';
+ 
+-var binary = require('node-pre-gyp'),
+-    path = require('path'),
+-    bindingPath = binary.find(path.resolve(__dirname, '..', 'package.json')),
+-    shapeindex = path.join(path.dirname(bindingPath), 'shapeindex'),
++var shapeindex = '/usr/bin/shapeindex',
+     spawn = require('child_process').spawn,
+     fs = require('fs');
+ 
diff --git a/debian/patches/nodejs.patch b/debian/patches/nodejs.patch
index 0b352fd..3859e4c 100644
--- a/debian/patches/nodejs.patch
+++ b/debian/patches/nodejs.patch
@@ -1,5 +1,6 @@
 Description: Switch NodeJS command from node (upstream) to nodejs (Debian).
 Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
 
 --- a/bin/mapnik-index.js
 +++ b/bin/mapnik-index.js
diff --git a/debian/patches/series b/debian/patches/series
index bf04208..b678921 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 test_disable_raster_layer.patch
 nodejs.patch
+node-pre-gyp.patch

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