[Pkg-javascript-commits] [Git][js-team/node-mapnik][node-12] 4 commits: Use pkg-js-tools auto install

[Xavier Guimard]

Xavier Guimard pushed to branch node-12 at Debian JavaScript Maintainers / node-mapnik


Commits:
a6a79e1a by Xavier Guimard at 2020-01-26T11:36:13+01:00
Use pkg-js-tools auto install

- - - - -
e494cbd9 by Xavier Guimard at 2020-01-26T11:36:19+01:00
Update d/ch

- - - - -
88bed9cf by Xavier Guimard at 2020-01-26T11:36:19+01:00
releasing package node-mapnik version 3.7.2+dfsg-6

- - - - -
ab166fdc by Xavier Guimard at 2020-01-26T11:42:17+01:00
Trying to fix for Node.js ≥ 12

- - - - -


10 changed files:

- debian/changelog
- debian/control
- debian/copyright
- − debian/install
- + debian/nodejs/files
- + debian/patches/node-12.diff
- debian/patches/series
- debian/rules
- debian/source/lintian-overrides
- − debian/tests/control


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+node-mapnik (3.7.2+dfsg-6) unstable; urgency=medium
+
+  * Team upload
+  * Bump debhelper compatibility level to 12
+  * Declare compliance with policy 4.5.0
+  * Add "Rules-Requires-Root: no"
+  * Use pkg-js-tools auto install
+
+ -- Xavier Guimard <yadd at debian.org>  Sun, 26 Jan 2020 11:22:04 +0100
+
 node-mapnik (3.7.2+dfsg-5) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -3,20 +3,22 @@ Maintainer: Debian Javascript Maintainers <pkg-javascript-devel at lists.alioth.deb
 Uploaders: David Paleino <dapal at debian.org>,
            Jérémy Lal <kapouer at melix.org>
 Section: javascript
+Testsuite: autopkgtest-pkg-nodejs
 Priority: optional
 Build-Depends: debhelper-compat (= 12),
                dh-buildinfo,
                libmapbox-wagyu-dev,
                libmapnik-dev (>= 3.0.22),
-               libprotozero-dev (>= 1.5.1),
+               libprotozero-dev,
                mapnik-utils,
                mapnik-vector-tile (>= 1.6.1+dfsg-6),
                node-gyp (>= 3.8.0-2),
                node-mocha,
                node-nan (>= 2.4.0),
                node-pre-gyp,
-               libnode-dev (>= 10~),
-               node-sphericalmercator
+               libnode-dev,
+               node-sphericalmercator,
+               pkg-js-tools (>= 0.9.20~)
 Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/js-team/node-mapnik
 Vcs-Git: https://salsa.debian.org/js-team/node-mapnik.git -b master-3.7


=====================================
debian/copyright
=====================================
@@ -19,7 +19,7 @@ Copyright: Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved.
 License: Bitstream
 
 Files: test/data/world_merc*
-Copyright: http://thematicmapping.org/downloads/world_borders.php
+Copyright: https://thematicmapping.org/downloads/world_borders.php
 License: CC-BY-SA-3.0
 
 Files: debian/*
@@ -65,7 +65,7 @@ License: GPL-2+
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
+ along with this program. If not, see <https://www.gnu.org/licenses/>
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
@@ -151,7 +151,7 @@ License: CC-BY-SA-3.0
  defined below) for the purposes of this License. 
  .
  c. "Creative Commons Compatible License" means a license that is listed 
- at http://creativecommons.org/compatiblelicenses that has been approved 
+ at https://creativecommons.org/compatiblelicenses that has been approved 
  by Creative Commons as being essentially equivalent to this License, 
  including, at a minimum, because that license: (i) contains terms that 
  have the same purpose, meaning and effect as the License Elements of 


=====================================
debian/install deleted
=====================================
@@ -1,2 +0,0 @@
-lib          usr/lib/nodejs/mapnik
-package.json usr/lib/nodejs/mapnik


=====================================
debian/nodejs/files
=====================================
@@ -0,0 +1 @@
+lib


=====================================
debian/patches/node-12.diff
=====================================
The diff for this file was not included because it is too large.

=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ test_disable_raster_layer.patch
 use-packaged-dependencies.patch
 no-mason.patch
 new_instance.patch
+node-12.diff


=====================================
debian/rules
=====================================
@@ -16,7 +16,7 @@ ifeq (,$(findstring $(DEB_BUILD_ARCH),"amd64"))
 endif
 
 %:
-	dh $@
+	dh $@ --with nodejs
 
 override_dh_auto_configure:
 	node-pre-gyp configure --enable_sse=$(SSE_MATH)
@@ -24,12 +24,8 @@ override_dh_auto_configure:
 override_dh_auto_build:
 	node-pre-gyp build --enable_sse=$(SSE_MATH)
 
-override_dh_auto_install:
-
-override_dh_auto_test:
-
 override_dh_install:
-	dh_install --list-missing
+	dh_install
 
 	dh_buildinfo
 
@@ -42,5 +38,4 @@ override_dh_install:
 	$(RM) $(CURDIR)/debian/*/usr/bin/mapnik-render
 	$(RM) $(CURDIR)/debian/*/usr/bin/mapnik-shapeindex
 
-	chmod 644 $(CURDIR)/debian/node-mapnik/usr/lib/nodejs/mapnik/lib/binding/mapnik.node
-
+	chmod 644 $(CURDIR)/debian/node-mapnik/usr/lib/*/nodejs/mapnik/lib/binding/mapnik.node


=====================================
debian/source/lintian-overrides
=====================================
@@ -1,5 +1,5 @@
 # False positive on test data
-node-mapnik source: insane-line-length-in-source-file test/palette.test.js *
+node-mapnik source: very-long-line-length-in-source-file test/palette.test.js *
 node-mapnik source: source-contains-prebuilt-javascript-object test/palette.test.js *
 node-mapnik source: source-is-missing test/palette.test.js *
 


=====================================
debian/tests/control deleted
=====================================
@@ -1,3 +0,0 @@
-Test-Command: node -e "require('mapnik');"
-Depends: @
-



View it on GitLab: https://salsa.debian.org/js-team/node-mapnik/compare/0863fed125af99ac09df41d44a82d71f2d8cc4eb...ab166fdcf697ee1798395f3f0f6b5166360cc4dd

-- 
View it on GitLab: https://salsa.debian.org/js-team/node-mapnik/compare/0863fed125af99ac09df41d44a82d71f2d8cc4eb...ab166fdcf697ee1798395f3f0f6b5166360cc4dd
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-javascript-commits/attachments/20200126/7d83b098/attachment-0001.html>