[mapnik-vector-tile] 13/14: Add patch to not use mason in Makefile (dependencies are packaged).

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository mapnik-vector-tile.

commit ac7681893c84b8a042104693f7ea733c58ec9c85
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Sep 26 21:48:42 2017 +0200

    Add patch to not use mason in Makefile (dependencies are packaged).
---
 debian/changelog              |  1 +
 debian/patches/no-mason.patch | 18 ++++++++++++++++++
 debian/patches/series         |  1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e2dc24c..5774674 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ mapnik-vector-tile (1.5.0+dfsg-1) UNRELEASED; urgency=medium
     (closes: #876902)
   * Drop mapnik-config.patch, fixed upstream.
   * Have dh_auto_build use release_base target.
+  * Add patch to not use mason in Makefile (dependencies are packaged).
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 26 Sep 2017 21:26:49 +0200
 
diff --git a/debian/patches/no-mason.patch b/debian/patches/no-mason.patch
new file mode 100644
index 0000000..5b2e5a7
--- /dev/null
+++ b/debian/patches/no-mason.patch
@@ -0,0 +1,18 @@
+Description: Disable mason, dependencies are packaged.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/Makefile
++++ b/Makefile
+@@ -28,10 +28,7 @@ debug: mason_packages/.link/bin/mapnik-c
+ # note: we set PATH to the mason bins to pick up protoc
+ # and CXXFLAGS/LDFLAGS to find protobuf headers/libs
+ # This will only find mason installed mapnik-config if run via the `release` or `debug` targets
+-release_base: mason_packages/.link/bin Makefile
+-	CXXFLAGS="-isystem `pwd`/mason_packages/.link/include $(CXXFLAGS)" \
+-	 LDFLAGS="-L`pwd`/mason_packages/.link/lib $(LDFLAGS)" \
+-	 PATH="`pwd`/mason_packages/.link/bin/:${PATH}" \
++release_base: Makefile
+ 	 BUILDTYPE=Release $(MAKE) build/Makefile
+ 
+ debug_base: mason_packages/.link/bin Makefile
diff --git a/debian/patches/series b/debian/patches/series
index 107f9ad..fe13947 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 test_using_created_tif.patch
 use-protozero-package.patch
 skip-tests-for-missing-data.patch
+no-mason.patch

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