[mapnik] 01/02: Don't include nik2img by upstream request.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository mapnik.

commit dd0aa060df83079a2b70511a22c1c21ed537a7ef
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 10 11:29:10 2015 +0200

    Don't include nik2img by upstream request.
---
 debian/changelog             |  2 +-
 debian/manpages/nik2img.1    | 62 --------------------------------------------
 debian/mapnik-utils.install  |  1 -
 debian/mapnik-utils.manpages |  1 -
 debian/rules                 |  2 ++
 5 files changed, 3 insertions(+), 65 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7fcc165..7effc4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ mapnik (3.0.0+ds-2) UNRELEASED; urgency=medium
     node-mapnik build.
     Add a short explanation and a link to upstream explanation into
     README.Debian.
-  * Include nik2img in mapnik-utils.
+  * Don't install nik2img by upstream request.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 09 Jul 2015 19:30:12 +0200
 
diff --git a/debian/manpages/nik2img.1 b/debian/manpages/nik2img.1
deleted file mode 100644
index 12dc3b4..0000000
--- a/debian/manpages/nik2img.1
+++ /dev/null
@@ -1,62 +0,0 @@
-'\" -*- coding: us-ascii -*-
-.if \n(.g .ds T< \\FC
-.if \n(.g .ds T> \\F[\n[.fam]]
-.de URL
-\\$2 \(la\\$1\(ra\\$3
-..
-.if \n(.g .mso www.tmac
-.TH nik2img 1 "10 July 2015" "" ""
-.SH NAME
-nik2img \- Mapnik Maps on the Command-Line
-.SH SYNOPSIS
-'nh
-.fi
-.ad l
-\fBnik2img\fR \kx
-.if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
-'in \n(.iu+\nxu
-[\fIoptions\fR]
-'in \n(.iu-\nxu
-.ad b
-'hy
-.SH DESCRIPTION
-\fBnik2img\fR is a third-party program that allows you to
-easily generate mapnik graphics from Mapnik xml or Cascadenik mml.
-.TP 0.2i
-\(bu
-No python coding is required, only a working Mapnik installation
-and an XML mapfile.
-.TP 0.2i
-\(bu
-\fBnik2img\fR has a variety of options that make it
-a useful mapfile debugger.
-.TP 0.2i
-\(bu
-Using \fBnik2img\fR is an easy way to test and
-develop your xml mapfiles before launching on a server.
-.TP 0.2i
-\(bu
-\fBnik2img\fR should automatically open the rendered
-map once completed.
-.SH OPTIONS
-.TP 
-\*(T<\fB\-h\fR\*(T>, \*(T<\fB\-\-help\fR\*(T>
-produce usage message
-.TP 
-\*(T<\fB\-V\fR\*(T>, \*(T<\fB\-\-version\fR\*(T>
-print version string
-.TP 
-\*(T<\fB\-v\fR\*(T>, \*(T<\fB\-\-verbose\fR\*(T>
-verbose output
-.TP 
-\*(T<\fB\-\-open\fR\*(T>
-automatically open the file after rendering (os x only
-.TP 
-\*(T<\fB\-\-xml\fR\*(T> \fIfile\fR
-xml map to read
-.TP 
-\*(T<\fB\-\-img\fR\*(T> \fIfile\fR
-image to render
-.TP 
-\*(T<\fB\-\-scale\-factor\fR\*(T> \fInumber\fR
-scale factor for rendering
diff --git a/debian/mapnik-utils.install b/debian/mapnik-utils.install
index de57e9e..24af807 100644
--- a/debian/mapnik-utils.install
+++ b/debian/mapnik-utils.install
@@ -1,2 +1 @@
-usr/bin/nik2img
 usr/bin/shapeindex
diff --git a/debian/mapnik-utils.manpages b/debian/mapnik-utils.manpages
index 9d18204..95433a0 100644
--- a/debian/mapnik-utils.manpages
+++ b/debian/mapnik-utils.manpages
@@ -1,2 +1 @@
-debian/manpages/nik2img.1
 debian/manpages/shapeindex.1
diff --git a/debian/rules b/debian/rules
index c4e17e0..02ee2ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,6 +54,8 @@ debian/stamps/test-python:
 	# nothing yet
 
 override_dh_install:
+	# Don't install nik2img, as requested by upstream
+	$(RM) debian/*/usr/bin/nik2img
 	dh_install --list-missing
 
 %:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik.git