[Pkg-javascript-commits] [node-mapnik] 16/17: Don't install binaries & manpages also included in mapnik-utils.

[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 01bc93404217d4e0eb3bbac032f9e007e64761e2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue May 10 19:33:43 2016 +0200

    Don't install binaries & manpages also included in mapnik-utils.
---
 debian/changelog       |  1 +
 debian/manpages        |  1 -
 debian/mapnik-render.1 | 19 -------------------
 debian/rules           |  5 +++++
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 832a28d..d7cfef1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ node-mapnik (3.5.12+dfsg-1) UNRELEASED; urgency=medium
   * Add patch to fix spelling errors.
   * Add dependency on node-pre-gyp.
   * Bump Standards-Version to 3.9.8, no changes.
+  * Don't install binaries & manpages also included in mapnik-utils.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 08 May 2016 23:17:36 +0200
 
diff --git a/debian/manpages b/debian/manpages
index 3a92745..f1100c3 100644
--- a/debian/manpages
+++ b/debian/manpages
@@ -1,2 +1 @@
 ./debian/mapnik-inspect.1
-./debian/mapnik-render.1
diff --git a/debian/mapnik-render.1 b/debian/mapnik-render.1
deleted file mode 100644
index 038b73a..0000000
--- a/debian/mapnik-render.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.TH "MAPNIK\-RENDER" "1" "August 2013" "" ""
-.SH "NAME"
-\fBmapnik-render\fR \- render image tiles from mapnik stylesheets
-.SH SYNOPSIS
-.P
-.RS 2
-.EX
-mapnik\-render <stylesheet> <image>
-.EE
-.RE
-.SH OPTIONS
-.P
-.RS 2
-.EX
-stylesheet: \.mml (requires node\-carto) or \.xml
-image: output path
-.EE
-.RE
-
diff --git a/debian/rules b/debian/rules
index 4fc00d4..e7f84a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,11 @@ override_dh_install:
 		cp $$i $(CURDIR)/debian/node-mapnik/usr/bin/`basename $$i .js`; \
 	done
 
+	# Don't install binaries with the same name in mapnik-utils
+	$(RM) $(CURDIR)/debian/*/usr/bin/mapnik-index
+	$(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
 
 override_dh_shlibdeps:

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