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

[Jérémy Lal]

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

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

commit 1837802ba6d24ad9bc4c4e96e7bf7559b82c2583
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sun Apr 10 01:33:24 2016 +0200

    Revert "Add patch to not require node-pre-gyp in executables."
    
    This reverts commit d039e58c4d132eadae4d856ae4605c6901a087a8.
---
 debian/changelog                  |  1 -
 debian/patches/node-pre-gyp.patch | 32 --------------------------------
 debian/patches/nodejs.patch       |  1 -
 debian/patches/series             |  1 -
 4 files changed, 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8a4f179..b831272 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,7 +17,6 @@ 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.
   * Add mapnik-utils to (build) dependencies for shapeindex.
 
  -- 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
deleted file mode 100644
index d970926..0000000
--- a/debian/patches/node-pre-gyp.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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 3859e4c..0b352fd 100644
--- a/debian/patches/nodejs.patch
+++ b/debian/patches/nodejs.patch
@@ -1,6 +1,5 @@
 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 b678921..bf04208 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 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