[mapnik-vector-tile] 04/07: Refresh patches.

[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 5593204e27b29f2aa4c9c73c42804bb806bb07d8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Feb 26 21:31:41 2016 +0100

    Refresh patches.
---
 debian/changelog                            |  1 +
 debian/patches/test_using_created_tif.patch | 10 +++++-----
 debian/patches/use-protozero-package.patch  | 26 ++++++++++++++++++++++----
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ee3f89f..e9bfe50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mapnik-vector-tile (1.0.1+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 26 Feb 2016 23:54:55 +0100
 
diff --git a/debian/patches/test_using_created_tif.patch b/debian/patches/test_using_created_tif.patch
index 72e64e2..da0e175 100644
--- a/debian/patches/test_using_created_tif.patch
+++ b/debian/patches/test_using_created_tif.patch
@@ -7,14 +7,14 @@ Forwarded: not-needed
 
 --- a/test/raster_tile.cpp
 +++ b/test/raster_tile.cpp
-@@ -88,8 +88,8 @@ TEST_CASE( "raster tile output 1", "shou
+@@ -99,8 +99,8 @@ TEST_CASE("raster tile output 1")
          mapnik::save_to_file(im_data,"test/fixtures/actual-2.jpeg","jpeg");
      }
  
 -    std::size_t expected_image_size = 45660;
--    int expected_vtile_size = expected_image_size + 26;
+-    std::size_t expected_vtile_size = expected_image_size + 26;
 +    std::size_t expected_image_size = 4723;
-+    int expected_vtile_size = expected_image_size + 23;
-     if (!debug) {
++    std::size_t expected_vtile_size = expected_image_size + 23;
+     if (!debug)
+     {
          CHECK(expected_image_size == ras_buffer.size());
-         CHECK(expected_vtile_size == tile.ByteSize());
diff --git a/debian/patches/use-protozero-package.patch b/debian/patches/use-protozero-package.patch
index bd3455d..2bcedea 100644
--- a/debian/patches/use-protozero-package.patch
+++ b/debian/patches/use-protozero-package.patch
@@ -44,12 +44,30 @@ Forwarded: not-needed
        ],
        "include_dirs": [
          "../src",
+-        '../deps/protozero/include',
++        '/usr/include',
+         '../test',
+         '../test/utils'
+       ]
+@@ -159,7 +159,7 @@
+       ],
+       "include_dirs": [
+         "../src",
+-        '../deps/protozero/include'
++        '/usr/include'
+       ]
+     },
+     {
+@@ -175,7 +175,7 @@
+       ],
+       "include_dirs": [
+         "../src",
 -        '../deps/protozero/include'
 +        '/usr/include'
        ]
      },
      {
-@@ -157,7 +157,7 @@
+@@ -191,7 +191,7 @@
        ],
        "include_dirs": [
          "../src",
@@ -58,7 +76,7 @@ Forwarded: not-needed
        ]
      },
      {
-@@ -173,7 +173,7 @@
+@@ -207,7 +207,7 @@
        ],
        "include_dirs": [
          "../src",
@@ -73,8 +91,8 @@ Forwarded: not-needed
  ./deps/clipper:
  	git clone https://github.com/mapnik/clipper.git -b r496-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
+-build/Makefile: ./deps/gyp ./deps/clipper ./deps/protozero gyp/build.gyp test/*
++build/Makefile: ./deps/gyp ./deps/clipper gyp/build.gyp test/*
  	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