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 ea803c53543893458373640f092ca2ddd0e237eb
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Thu Feb 8 16:23:26 2018 +0100

    Refresh patches.
---
 debian/changelog                           |  1 +
 debian/patches/no-mason.patch              |  2 +-
 debian/patches/use-protozero-package.patch | 10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cc7f7f9..569ef3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mapnik-vector-tile (1.6.0+dfsg-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebas...@debian.org>  Thu, 08 Feb 2018 16:21:28 +0100
 
diff --git a/debian/patches/no-mason.patch b/debian/patches/no-mason.patch
index 5b2e5a7..3d3ae26 100644
--- a/debian/patches/no-mason.patch
+++ b/debian/patches/no-mason.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/Makefile
 +++ b/Makefile
-@@ -28,10 +28,7 @@ debug: mason_packages/.link/bin/mapnik-c
+@@ -30,10 +30,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
diff --git a/debian/patches/use-protozero-package.patch 
b/debian/patches/use-protozero-package.patch
index b3b1cbb..e0fdbec 100644
--- a/debian/patches/use-protozero-package.patch
+++ b/debian/patches/use-protozero-package.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/gyp/build.gyp
 +++ b/gyp/build.gyp
-@@ -37,7 +37,8 @@
+@@ -38,7 +38,8 @@
          "<(SHARED_INTERMEDIATE_DIR)/vector_tile.pb.cc"
        ],
        'include_dirs': [
@@ -12,9 +12,9 @@ Forwarded: not-needed
 +        '<(SHARED_INTERMEDIATE_DIR)/',
 +        '/usr/include'
        ],
-       'cflags_cc' : [
-           '-D_THREAD_SAFE',
-@@ -55,7 +56,8 @@
+       'conditions': [
+         ['enable_sse == "true"', {
+@@ -61,7 +62,8 @@
        },
        'direct_dependent_settings': {
          'include_dirs': [
@@ -24,7 +24,7 @@ Forwarded: not-needed
          ],
          'libraries':[
            '-lprotobuf-lite'
-@@ -91,7 +93,8 @@
+@@ -102,7 +104,8 @@
        },
        'direct_dependent_settings': {
          'include_dirs': [

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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to