[Pkg-javascript-commits] [node-mapnik] 06/07: Drop nodejs.patch, interpreter is /usr/bin/node again.

[Bas 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 70b7ee6901b062f0171f13d55c439196d25c1ee4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Nov 30 14:04:00 2017 +0100

    Drop nodejs.patch, interpreter is /usr/bin/node again.
---
 debian/changelog                               |  1 +
 debian/patches/no-mason.patch                  |  2 +-
 debian/patches/nodejs.patch                    | 54 --------------------------
 debian/patches/series                          |  1 -
 debian/patches/use-packaged-dependencies.patch |  6 +--
 5 files changed, 5 insertions(+), 59 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9516d6c..3116ac3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ node-mapnik (3.6.2+dfsg-2) UNRELEASED; urgency=medium
   * Add patch with changes from upstream git repository.
   * Change priority from extra to optional.
   * Change section from web to javascript.
+  * Drop nodejs.patch, interpreter is /usr/bin/node again.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 16 Nov 2017 20:52:36 +0100
 
diff --git a/debian/patches/no-mason.patch b/debian/patches/no-mason.patch
index 79be4e0..9190a8a 100644
--- a/debian/patches/no-mason.patch
+++ b/debian/patches/no-mason.patch
@@ -15,5 +15,5 @@ Forwarded: not-needed
 +        '/usr/include/freetype2',
 +        '/usr/include/cairo',
          './src',
-         "<!(nodejs -e \"require('nan')\")",
+         "<!(node -e \"require('nan')\")",
          '/usr/include'
diff --git a/debian/patches/nodejs.patch b/debian/patches/nodejs.patch
deleted file mode 100644
index 058186f..0000000
--- a/debian/patches/nodejs.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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
-@@ -34,13 +34,13 @@
-         './mason_packages/.link/include/freetype2',
-         './mason_packages/.link/include/cairo',
-         './src',
--        "<!(node -e \"require('nan')\")",
-+        "<!(nodejs -e \"require('nan')\")",
-         # TODO: move these to mason packages once we have a minimal windows client for mason (@springmeyer)
-         # https://github.com/mapbox/mason/issues/396
-         "./deps/geometry/include/",
-         "./deps/wagyu/include/",
--        "<!(node -e \"require('protozero')\")",
--        "<!(node -e \"require('mapnik-vector-tile')\")"
-+        "<!(nodejs -e \"require('protozero')\")",
-+        "<!(nodejs -e \"require('mapnik-vector-tile')\")"
-       ],
-       'defines': [
-           'MAPNIK_GIT_REVISION="<!@(mapnik-config --git-describe)"',
diff --git a/debian/patches/series b/debian/patches/series
index 25044c2..e32d3a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 upstream-git.patch
 test_disable_raster_layer.patch
-nodejs.patch
 use-packaged-dependencies.patch
 no-mason.patch
diff --git a/debian/patches/use-packaged-dependencies.patch b/debian/patches/use-packaged-dependencies.patch
index dec79eb..16a5fda 100644
--- a/debian/patches/use-packaged-dependencies.patch
+++ b/debian/patches/use-packaged-dependencies.patch
@@ -7,13 +7,13 @@ Forwarded: not-needed
 @@ -35,12 +35,7 @@
          './mason_packages/.link/include/cairo',
          './src',
-         "<!(nodejs -e \"require('nan')\")",
+         "<!(node -e \"require('nan')\")",
 -        # TODO: move these to mason packages once we have a minimal windows client for mason (@springmeyer)
 -        # https://github.com/mapbox/mason/issues/396
 -        "./deps/geometry/include/",
 -        "./deps/wagyu/include/",
--        "<!(nodejs -e \"require('protozero')\")",
--        "<!(nodejs -e \"require('mapnik-vector-tile')\")"
+-        "<!(node -e \"require('protozero')\")",
+-        "<!(node -e \"require('mapnik-vector-tile')\")"
 +        '/usr/include'
        ],
        'defines': [

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