[mapnik] 01/01: Don't remove mapnik-render anymore, upstream says it's suitable for inclusion now.

[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 f004d2ad941846f801935df5440c410406236010
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Oct 22 09:23:19 2015 +0200

    Don't remove mapnik-render anymore, upstream says it's suitable for inclusion now.
---
 debian/changelog | 7 +++++++
 debian/rules     | 2 --
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index af1230a..475d958 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mapnik (3.0.7+ds-5) UNRELEASED; urgency=medium
+
+  * Don't remove mapnik-render anymore, upstream says it's suitable for
+    inclusion now.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 22 Oct 2015 09:22:11 +0200
+
 mapnik (3.0.7+ds-4) unstable; urgency=medium
 
   * Fix typo in NJOBS variable for non parallel builds on arm64 & armel.
diff --git a/debian/rules b/debian/rules
index 88769f7..b475ed5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,8 +65,6 @@ debian/stamps/install-python:
 	$(SCONS) $(NJOBS) -C build-python install
 
 override_dh_install:
-	# Don't install mapnik-render (previously nik2img), as requested by upstream
-	$(RM) debian/*/usr/bin/mapnik-render
 	dh_install --list-missing
 
 override_dh_prep:

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