[mapnik-vector-tile] 15/15: Use protobuf Debian package.

[Sebastiaan 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 4314e7ee9d6755d7135635a8391bc7c88f049463
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 11 23:24:00 2015 +0200

    Use protobuf Debian package.
---
 debian/changelog                           |  1 +
 debian/control                             |  3 ++
 debian/patches/series                      |  1 +
 debian/patches/use-protozero-package.patch | 80 ++++++++++++++++++++++++++++++
 4 files changed, 85 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 03b3fcc..13fe8f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ mapnik-vector-tile (0.10.0+dfsg-1) UNRELEASED; urgency=medium
     - Use repacksuffix option for appending +dfsg
   * Update Vcs-Browser URL to use cgit instead of gitweb.
   * Restructure control file with cme.
+  * Use protobuf Debian package.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 11 Sep 2015 23:04:17 +0200
 
diff --git a/debian/control b/debian/control
index f8df707..69add72 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 9),
                gyp,
                protobuf-compiler,
                libprotobuf-dev,
+               libprotozero-dev,
                catch,
                libmapnik-dev (>= 3.0.0~),
                python,
@@ -20,6 +21,7 @@ Package: mapnik-vector-tile
 Architecture: all
 Depends: ${misc:Depends},
          libprotobuf-dev,
+         libprotozero-dev,
          libmapnik-dev (>= 3.0.0~)
 Description: Vector tiles integration with mapnik - development files
  This package provides C++ header and source needed to render geodata
@@ -30,3 +32,4 @@ Description: Vector tiles integration with mapnik - development files
  shapefiles, without compromising on speed.
  .
  Mapnik is a C++/Python toolkit for developing GIS applications.
+
diff --git a/debian/patches/series b/debian/patches/series
index 794e672..45e9161 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 test_using_created_tif.patch
+use-protozero-package.patch
diff --git a/debian/patches/use-protozero-package.patch b/debian/patches/use-protozero-package.patch
new file mode 100644
index 0000000..54e3b4e
--- /dev/null
+++ b/debian/patches/use-protozero-package.patch
@@ -0,0 +1,80 @@
+Description: Use protobuf Debian package.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/gyp/build.gyp
++++ b/gyp/build.gyp
+@@ -42,7 +42,7 @@
+       ],
+       'include_dirs': [
+         '<(SHARED_INTERMEDIATE_DIR)/',
+-        '../deps/protozero/include'
++        '/usr/include'
+       ],
+       'cflags_cc' : [
+           '-D_THREAD_SAFE',
+@@ -61,7 +61,7 @@
+       'direct_dependent_settings': {
+         'include_dirs': [
+           '<(SHARED_INTERMEDIATE_DIR)/',
+-          '../deps/protozero/include'
++          '/usr/include'
+         ],
+         'libraries':[
+           '-lprotobuf-lite'
+@@ -92,7 +92,7 @@
+           '<!@(mapnik-config --cflags)'
+       ],
+       'include_dirs': [
+-        '../deps/protozero/include',
++        '/usr/include',
+         '../deps/clipper/cpp'
+       ],
+       'xcode_settings': {
+@@ -103,7 +103,7 @@
+       'direct_dependent_settings': {
+         'include_dirs': [
+           '<(SHARED_INTERMEDIATE_DIR)/',
+-          '../deps/protozero/include',
++          '/usr/include',
+           '../deps/clipper/cpp'
+         ],
+         'defines' : [
+@@ -141,7 +141,7 @@
+       ],
+       "include_dirs": [
+         "../src",
+-        '../deps/protozero/include'
++        '/usr/include'
+       ]
+     },
+     {
+@@ -157,7 +157,7 @@
+       ],
+       "include_dirs": [
+         "../src",
+-        '../deps/protozero/include'
++        '/usr/include'
+       ]
+     },
+     {
+@@ -173,7 +173,7 @@
+       ],
+       "include_dirs": [
+         "../src",
+-        '../deps/protozero/include'
++        '/usr/include'
+       ]
+     },
+     {
+--- a/Makefile
++++ b/Makefile
+@@ -16,7 +16,7 @@ all: libvtile
+ ./deps/clipper:
+ 	git clone https://github.com/mapnik/clipper.git -b r493-mapnik ./deps/clipper && cd ./deps/clipper && git checkout $(CLIPPER_REVISION) && ./cpp/fix_members.sh
+ 
+-build/Makefile: ./deps/gyp ./deps/clipper ./deps/protozero gyp/build.gyp test/*cpp
++build/Makefile: ./deps/gyp ./deps/clipper gyp/build.gyp test/*cpp
+ 	deps/gyp/gyp gyp/build.gyp --depth=. -DMAPNIK_PLUGINDIR=\"$(MAPNIK_PLUGINDIR)\" -Goutput_dir=. --generator-output=./build -f make
+ 
+ libvtile: build/Makefile Makefile

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