Bug#796509: dominate now in the archive
Control: tags -1 pending I have managed to package python-dominate and it is in the archive, so this is no longer a blocker for Creepy 1.3. Regards, Ross signature.asc Description: OpenPGP digital signature ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processed: dominate now in the archive
Processing control commands: > tags -1 pending Bug #796509 [creepy] creepy: New version of creepy 1.3 needs new python-dominate to be packaged Added tag(s) pending. -- 796509: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=796509 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processed: Creepy: Flickr plugin not working
Processing control commands: > retitle -1 Creepy: "Flickr plugin not working" Bug #770591 [creepy] Creepy: Plugins not working Changed Bug title to 'Creepy: "Flickr plugin not working"' from 'Creepy: Plugins not working' -- 770591: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770591 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#770591: Creepy: Flickr plugin not working
Control: retitle -1 Creepy: "Flickr plugin not working" Hi, So lets try and push to get Creepy working for Stretch. I am going to try and concentrate on one plugin. Hence the retitle. I will create separate bugs for the other plugins. Regards, Ross signature.asc Description: OpenPGP digital signature ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#798751: creepy: Twitter Plugin not working
Package: creepy Version: 1.2~alpha-1 Severity: normal Dear Maintainer, I am creating separate bugs for each plugin that is not working in Creepy. The twitter plug in is probably not working for the same reason as the flickr one. Creepy assumes all the code is in the source tree, but in Debian we install it to /usr/share where it is not possible to write configuration & log files etc. Regards, Ross -- System Information: Debian Release: jessie/sid APT prefers vivid-updates APT policy: (500, 'vivid-updates'), (500, 'vivid-security'), (500, 'vivid'), (100, 'vivid-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.19.0-28-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#798752: creepy: Google+ plugin is not enabled in Debian
Package: creepy Version: 1.2~alpha-1 Severity: normal Dear Maintainer, There is a Creepy plugin for Google+, that is not currently enabled. We need to depend on python-googleapi in the Debian archive and do some testing. Regards, Ross -- System Information: Debian Release: jessie/sid APT prefers vivid-updates APT policy: (500, 'vivid-updates'), (500, 'vivid-security'), (500, 'vivid'), (100, 'vivid-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.19.0-28-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#798757: creepy: Instagram plugin is not enabled in Creepy
Package: creepy Version: 1.2~alpha-1 Severity: wishlist Dear Maintainer, The instagram plugin is not enabled for Creepy due to the python-instagram plugin not being available in Debian. There is an ITP which is awaiting sponsorship: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769928 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770149 Regards, Ross -- System Information: Debian Release: jessie/sid APT prefers vivid-updates APT policy: (500, 'vivid-updates'), (500, 'vivid-security'), (500, 'vivid'), (100, 'vivid-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.19.0-28-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processed: block 798757 with 769928
Processing commands for cont...@bugs.debian.org: > block 798757 with 769928 Bug #798757 [creepy] creepy: Instagram plugin is not enabled in Creepy 798757 was not blocked by any bugs. 798757 was not blocking any bugs. Added blocking bug(s) of 798757: 769928 > thanks Stopping processing here. Please contact me if you need assistance. -- 798757: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=798757 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapnik-vector-tile] 01/15: Imported Upstream version 0.8.1+dfsg
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 49f807b4efdb6975697456d92e0a30be2ee7e1bf Author: Bas Couwenberg Date: Fri Sep 11 22:54:58 2015 +0200 Imported Upstream version 0.8.1+dfsg --- CHANGELOG.md | 10 + Makefile | 14 +- README.md| 2 +- bootstrap.sh | 2 +- examples/c++/tileinfo.cpp| 3 +- gyp/build.gyp| 36 +- package.json | 2 +- src/vector_tile_backend_pbf.ipp | 2 + src/vector_tile_datasource.ipp | 3 +- src/vector_tile_datasource_pbf.cpp | 2 + src/vector_tile_datasource_pbf.hpp | 59 +++ src/vector_tile_datasource_pbf.ipp | 413 + src/vector_tile_geometry_decoder.hpp | 105 - src/vector_tile_geometry_encoder.hpp | 12 +- src/vector_tile_processor.ipp| 63 +-- src/vector_tile_strategy.hpp | 88 test/clipper_test.cpp| 143 ++ test/data/natural_earth.tif | Bin 3299605 -> 0 bytes test/data/tile_with_extra_feature_field.pbf | 2 + test/data/tile_with_extra_field.pbf | 2 + test/data/tile_with_extra_layer_fields.pbf | 2 + test/data/tile_with_invalid_layer_value_type.pbf | 2 + test/data/tile_with_unexpected_geomtype.pbf | 3 + test/encoding_util.hpp | 3 +- test/geometry_encoding.cpp | 22 +- test/test_main.cpp | 9 +- test/test_utils.cpp | 16 +- test/vector_tile.cpp | 84 ++-- test/vector_tile_pbf.cpp | 557 +++ 29 files changed, 1543 insertions(+), 118 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72c1c12..da1f497 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## 0.8.1 + + - Added `tile_datasource_pbf` - It should be used in places where you need to plug + in a `mapnik::datasource` to read from a binary encoded .pbf buffer. (@danpat #114) + - Updated bundled clipper to https://github.com/mapnik/clipper/commit/bfad32ec4b41783497d076c2ec44c7cbf4ebe56b + - Clipper is now patched to avoid abort on out of range coordinates (#111) + - Fixed handling of geometry collections (#106) + - Added mapnik vector tile strategy for transform + - Updated test cases + ## 0.8.0 - Now using `boost::geometry` to clip lines and `ClipperLib` to clip polygons diff --git a/Makefile b/Makefile index 71b405d..a518b5a 100755 --- a/Makefile +++ b/Makefile @@ -1,12 +1,22 @@ MAPNIK_PLUGINDIR := $(shell mapnik-config --input-plugins) BUILDTYPE ?= Release +CLIPPER_REVISION=bfad32e +PBF_REVISION=1df6453 +GYP_REVISION=3464008 + all: libvtile ./deps/gyp: - git clone https://chromium.googlesource.com/external/gyp.git ./deps/gyp && cd ./deps/gyp && git checkout 3464008 + git clone https://chromium.googlesource.com/external/gyp.git ./deps/gyp && cd ./deps/gyp && git checkout $(GYP_REVISION) + +./deps/pbf: + git clone https://github.com/mapbox/pbf.hpp.git ./deps/pbf && cd ./deps/pbf && git checkout $(PBF_REVISION) + +./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 gyp/build.gyp test/*cpp +build/Makefile: ./deps/gyp ./deps/clipper ./deps/pbf 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 diff --git a/README.md b/README.md index f47e297..5a1c2b2 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Provides C++ headers that support rendering geodata into vector tiles and render ## Depends - - mapnik-vector-tile 0.7.x depends on Mapnik v3.0.x (until 3.0.0 is released this means latest mapnik HEAD) + - mapnik-vector-tile >=0.7.x depends on Mapnik v3.0.x (until 3.0.0 is released this means latest mapnik HEAD) - mapnik-vector-tile 0.6.x and previous work with Mapnik v2.2.x or v2.3.x - You will need `libmapnik` and `mapnik-config` available - Protobuf: `libprotobuf` and `protoc` diff --git a/bootstrap.sh b/bootstrap.sh index d98f431..6e47b2f 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -22,7 +22,7 @@ function install() { } function install_mason_deps() { -install mapnik latest +install mapnik 3.0.0-rc3 install protobuf 2.6.1 install freetype 2.5.5 install harfbuzz 0.9.40 diff --git a/e
[mapnik-vector-tile] branch master updated (c9c018d -> 4314e7e)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository mapnik-vector-tile. from c9c018d Update Vcs-Browser URL to use cgit instead of gitweb. new 49f807b Imported Upstream version 0.8.1+dfsg new ac61df0 Imported Upstream version 0.8.2+dfsg new 1e0d828 Imported Upstream version 0.8.3+dfsg new 137d9fd Imported Upstream version 0.8.4+dfsg new 3fa1df4 Imported Upstream version 0.8.5+dfsg new ae7ec37 Imported Upstream version 0.9.0+dfsg new 7208ca5 Imported Upstream version 0.9.1+dfsg new 9b74216 Imported Upstream version 0.9.2+dfsg new 310997b Imported Upstream version 0.9.3+dfsg new ec8da71 Imported Upstream version 0.10.0+dfsg new 299a046 Merge tag 'upstream/0.10.0+dfsg' new 7f4f621 Imported upstream version 0.10.0+dfsg. new 9164ad8 Restructure control file with cme. new 2e4298d Refresh patches. new 4314e7e Use protobuf Debian package. The 15 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: .gitignore | 2 + .npmignore | 13 +- .travis.yml| 4 + CHANGELOG.md | 56 ++ CONTRIBUTING.md| 15 + Makefile | 20 +- README.md | 2 +- bench/enf.t5yd5cdi_14_13089_8506.vector.pbf| Bin 0 -> 1353537 bytes bench/multi_line_13_1310_3166.vector.pbf | Bin 0 -> 265593 bytes bench/notes.md | 58 ++ bench/vtile-decode.cpp | 127 + bench/vtile-transform.cpp | 101 bootstrap.sh | 2 +- debian/changelog | 9 +- debian/control | 35 +- debian/patches/series | 1 + debian/patches/test_using_created_tif.patch| 3 +- debian/patches/use-protozero-package.patch | 80 +++ examples/c++/tileinfo.cpp | 45 +- gyp/build.gyp | 78 ++- package.json | 2 +- scripts/build.sh | 2 + scripts/coverage.sh| 4 +- src/vector_tile_backend_pbf.hpp| 17 +- src/vector_tile_backend_pbf.ipp| 7 +- src/vector_tile_compression.hpp| 15 +- src/vector_tile_compression.ipp| 32 +- src/vector_tile_datasource.ipp | 15 +- src/vector_tile_datasource_pbf.cpp | 2 + ...tasource.hpp => vector_tile_datasource_pbf.hpp} | 33 +- src/vector_tile_datasource_pbf.ipp | 420 ++ src/vector_tile_geometry_decoder.hpp | 552 -- src/vector_tile_geometry_encoder.hpp | 134 - src/vector_tile_processor.hpp | 15 +- src/vector_tile_processor.ipp | 379 +++-- src/vector_tile_strategy.hpp | 288 ++ src/vector_tile_util.hpp | 1 + src/vector_tile_util.ipp | 104 test/clipper_test.cpp | 191 +++ test/data/NZ_Coastline_NZMG.dbf| Bin 0 -> 143 bytes test/data/NZ_Coastline_NZMG.prj| 1 + test/data/NZ_Coastline_NZMG.qpj| 1 + test/data/NZ_Coastline_NZMG.shp| Bin 0 -> 1268 bytes test/data/NZ_Coastline_NZMG.shx| Bin 0 -> 116 bytes test/data/invalid-interior-ring.json | 95 test/data/linestrings_and_point.geojson| 56 ++ test/data/natural_earth.tif| Bin 3299605 -> 0 bytes test/data/poly-lat-invalid-4269.dbf| Bin 0 -> 77 bytes test/data/poly-lat-invalid-4269.prj| 1 + test/data/poly-lat-invalid-4269.shp| Bin 0 -> 316 bytes test/data/poly-lat-invalid-4269.shx| Bin 0 -> 108 bytes test/data/{raster_style.xml => polygon-style.xml} | 2 +- test/data/tile_with_extra_feature_field.pbf| 2 + test/data/tile_with_extra_field.pbf| 2 + test/data/tile_with_extra_layer_fields.pbf | 2 + test/data/tile_with_invalid_layer_value_type.pbf | 2 + test/data/tile_with_unexpected_geomtype.pbf| 3 + test/encoding_util.hp
[mapnik-vector-tile] 04/15: Imported Upstream version 0.8.4+dfsg
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 137d9fdb40429d6803f93e86ef937f707cf97b1a Author: Bas Couwenberg Date: Fri Sep 11 22:55:15 2015 +0200 Imported Upstream version 0.8.4+dfsg --- CHANGELOG.md | 8 + bench/vtile-transform.cpp| 25 ++- package.json | 2 +- src/vector_tile_backend_pbf.hpp | 11 +- src/vector_tile_geometry_decoder.hpp | 374 +-- src/vector_tile_processor.hpp| 12 +- src/vector_tile_processor.ipp| 191 ++ src/vector_tile_strategy.hpp | 55 +- test/clipper_test.cpp| 59 +- test/data/NZ_Coastline_NZMG.dbf | Bin 0 -> 143 bytes test/data/NZ_Coastline_NZMG.prj | 1 + test/data/NZ_Coastline_NZMG.qpj | 1 + test/data/NZ_Coastline_NZMG.shp | Bin 0 -> 1268 bytes test/data/NZ_Coastline_NZMG.shx | Bin 0 -> 116 bytes test/data/invalid-interior-ring.json | 95 + test/geometry_encoding.cpp | 122 +++- test/test_utils.cpp | 16 ++ test/test_utils.hpp | 1 + test/vector_tile.cpp | 102 +- test/vector_tile_pbf.cpp | 20 +- 20 files changed, 692 insertions(+), 403 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad096c4..d38b756 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,15 @@ # Changelog +## 0.8.4 + + - Started to skip coordinates that are out of range (#121) + - Fix clipping box used when reprojecting data on the fly (#128) + - Fixed decoding of degenerate polygons - we need to gracefully support these as they + are commonly in the wild based on that AGG clipper used in v0.7.1 and earlier (#123) + ## 0.8.3 + - Started to skip coordinates that cannot be reprojected (#117) - Minor optimization in attribute encoding by using `emplace` instead of `insert` - Now depends on `pbf_writer.hpp` for zigzag implementation (no change in behavior) - Minor code cleanup to avoid unnecessary compiler warnings diff --git a/bench/vtile-transform.cpp b/bench/vtile-transform.cpp index 01cc25f..772a90d 100644 --- a/bench/vtile-transform.cpp +++ b/bench/vtile-transform.cpp @@ -46,8 +46,9 @@ int main() { unsigned count = 0; unsigned count2 = 0; +unsigned count3 = 0; { -mapnik::vector_tile_impl::vector_tile_strategy vs(prj_trans, tr, 16); +mapnik::vector_tile_impl::vector_tile_strategy vs(tr, 16); mapnik::progress_timer __stats__(std::clog, "boost::geometry::transform"); for (unsigned i=0;i<1;++i) { @@ -57,9 +58,9 @@ int main() { } } { -mapnik::vector_tile_impl::vector_tile_strategy vs(prj_trans, tr, 16); -mapnik::progress_timer __stats__(std::clog, "transform_visitor with reserve"); -mapnik::vector_tile_impl::transform_visitor transit(vs); +mapnik::vector_tile_impl::vector_tile_strategy_proj vs(prj_trans,tr, 16); +mapnik::progress_timer __stats__(std::clog, "transform_visitor with reserve with proj no-op"); + mapnik::vector_tile_impl::transform_visitor transit(vs); for (unsigned i=0;i<1;++i) { mapnik::geometry::geometry new_geom = mapnik::util::apply_visitor(transit,geom); @@ -72,5 +73,21 @@ int main() { return -1; } } +{ +mapnik::vector_tile_impl::vector_tile_strategy vs(tr, 16); +mapnik::progress_timer __stats__(std::clog, "transform_visitor with reserve with no proj function call overhead"); + mapnik::vector_tile_impl::transform_visitor transit(vs); +for (unsigned i=0;i<1;++i) +{ +mapnik::geometry::geometry new_geom = mapnik::util::apply_visitor(transit,geom); +auto const& poly = mapnik::util::get>(new_geom); +count3 += poly.size(); +} +if (count != count3) +{ +std::clog << "tests did not run as expected!\n"; +return -1; +} +} return 0; } \ No newline at end of file diff --git a/package.json b/package.json index 311f840..7dfbbd3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mapnik-vector-tile", -"version": "0.8.3", +"version": "0.8.4", "description": "Mapnik vector tile API", "main": "./package.json", "repository" : { diff --git a/src/vector_tile_backend_pbf.hpp b/src/vector_tile_backend_pbf.hpp index 3198e19..0090663 100644 --- a/src/vector_tile_backend_pbf.hpp +++ b/src/vector_tile_backend_pbf.hpp @@ -12,12 +12,11 @@ #include "vector_tile_geometry_encoder.hpp" #include #include +#include -// boost -#include - -namespace mapnik { -class feature_impl; +namespace mapnik +{ +class feature_impl; } namespace mapnik { namespace vector_tile_imp
[mapnik-vector-tile] 02/15: Imported Upstream version 0.8.2+dfsg
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 ac61df0d6736fe061ef2619028b2333f5603e342 Author: Bas Couwenberg Date: Fri Sep 11 22:55:04 2015 +0200 Imported Upstream version 0.8.2+dfsg --- .travis.yml| 4 + CHANGELOG.md | 4 + bench/vtile-transform.cpp | 76 ++ bootstrap.sh | 2 +- gyp/build.gyp | 18 +++- package.json | 2 +- scripts/build.sh | 2 + src/vector_tile_processor.ipp | 3 +- src/vector_tile_strategy.hpp | 182 +++-- test/data/poly-lat-invalid-4269.dbf| Bin 0 -> 77 bytes test/data/poly-lat-invalid-4269.prj| 1 + test/data/poly-lat-invalid-4269.shp| Bin 0 -> 316 bytes test/data/poly-lat-invalid-4269.shx| Bin 0 -> 108 bytes test/data/polygon-style.xml| 7 ++ test/fixtures/transform-expected-1.png | Bin 0 -> 2374 bytes test/geometry_encoding.cpp | 10 +- test/raster_tile.cpp | 2 - test/test_main.cpp | 2 + test/vector_tile.cpp | 83 ++- test/vector_tile_pbf.cpp | 1 - 20 files changed, 355 insertions(+), 44 deletions(-) diff --git a/.travis.yml b/.travis.yml index 165123e..ca0a2ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,10 @@ matrix: compiler: clang env: JOBS=10 COVERAGE=true BUILDTYPE=Debug sudo: false +- os: osx + compiler: clang + env: JOBS=10 + sudo: false before_install: - source ./bootstrap.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index da1f497..0f40bc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.8.2 + + - Optimized coordinate transform that skips proj4 failures (#116) + ## 0.8.1 - Added `tile_datasource_pbf` - It should be used in places where you need to plug diff --git a/bench/vtile-transform.cpp b/bench/vtile-transform.cpp new file mode 100644 index 000..01cc25f --- /dev/null +++ b/bench/vtile-transform.cpp @@ -0,0 +1,76 @@ +#include +#include +#include +#include +#include + +#include "vector_tile_strategy.hpp" +#include "vector_tile_projection.hpp" + +/* + +# 1 times +no reserve + transform_visitor + - 2.77 + +with reserve + - 1.69 + +boost::geometry::transform + - 2.3 + +*/ + +int main() { +mapnik::projection merc("+init=epsg:3857",true); +mapnik::proj_transform prj_trans(merc,merc); // no-op +unsigned tile_size = 256; +mapnik::vector_tile_impl::spherical_mercator merc_tiler(tile_size); +double minx,miny,maxx,maxy; +merc_tiler.xyz(9664,20435,15,minx,miny,maxx,maxy); +mapnik::box2d z15_extent(minx,miny,maxx,maxy); +mapnik::view_transform tr(tile_size,tile_size,z15_extent,0,0); +std::string geojson_file("./test/data/poly.geojson"); +mapnik::util::file input(geojson_file); +if (!input.open()) +{ +throw std::runtime_error("failed to open geojson"); +} +mapnik::geometry::geometry geom; +std::string json_string(input.data().get(), input.size()); +if (!mapnik::json::from_geojson(json_string, geom)) +{ +throw std::runtime_error("failed to parse geojson"); +} +mapnik::geometry::correct(geom); + +unsigned count = 0; +unsigned count2 = 0; +{ +mapnik::vector_tile_impl::vector_tile_strategy vs(prj_trans, tr, 16); +mapnik::progress_timer __stats__(std::clog, "boost::geometry::transform"); +for (unsigned i=0;i<1;++i) +{ +mapnik::geometry::geometry new_geom = mapnik::geometry::transform(geom, vs); +auto const& poly = mapnik::util::get>(new_geom); +count += poly.size(); +} +} +{ +mapnik::vector_tile_impl::vector_tile_strategy vs(prj_trans, tr, 16); +mapnik::progress_timer __stats__(std::clog, "transform_visitor with reserve"); +mapnik::vector_tile_impl::transform_visitor transit(vs); +for (unsigned i=0;i<1;++i) +{ +mapnik::geometry::geometry new_geom = mapnik::util::apply_visitor(transit,geom); +auto const& poly = mapnik::util::get>(new_geom); +count2 += poly.size(); +} +if (count != count2) +{ +std::clog << "tests did not run as expected!\n"; +return -1; +} +} +return 0; +} \ No newline at end of file diff --git a/bootstrap.sh b/bootstrap.sh index 6e47b2f..d98f431 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -22,7 +22,7 @@ function install() { } function install_mason_deps() { -install mapnik 3.0.0-rc3 +install mapnik latest install protobuf 2.6.1 install freetype 2.5.5 install harfbuzz 0.9.40 diff --gi
[mapnik-vector-tile] 07/15: Imported Upstream version 0.9.1+dfsg
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 7208ca5315b5effd700a34467bea4ce329f1 Author: Bas Couwenberg Date: Fri Sep 11 22:55:30 2015 +0200 Imported Upstream version 0.9.1+dfsg --- CHANGELOG.md | 4 ++ CONTRIBUTING.md | 3 +- package.json | 2 +- src/vector_tile_util.hpp | 1 + src/vector_tile_util.ipp | 98 test/vector_tile.cpp | 37 ++ test/vector_tile_pbf.cpp | 21 +++ 7 files changed, 157 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79e0380..76c85ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.9.1 + + - Added `is_solid_extent` implementation based on protozero decoder + ## 0.9.0 - Upgraded to protozero v1.0.0 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ad498ac..bdfe804 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,6 +9,7 @@ To release a new node-mapnik version: - Make sure that all tests as passing (including travis and appveyor tests). - Update the CHANGELOG.md - Make a "bump commit" by updating the version in `package.json` and adding a commit like `-m "bump to v0.8.5"` - - Create a github tag like `git tag -a v0.8.5 -m "v0.8.5"` + - Create a github tag like `git tag -a v0.8.5 -m "v0.8.5" && git push --tags` + - Ensure travis tests are passing - Ensure you have a clean checkout (no extra files in your check that are not known by git). You need to be careful, for instance, to avoid a large accidental file being packaged by npm. You can get a view of what npm will publish by running `make testpack` - Then publish the module to npm repositories by running `npm publish` diff --git a/package.json b/package.json index 849d896..fb3cda9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mapnik-vector-tile", -"version": "0.9.0", +"version": "0.9.1", "description": "Mapnik vector tile API", "main": "./package.json", "repository" : { diff --git a/src/vector_tile_util.hpp b/src/vector_tile_util.hpp index 800db92..fae87dd 100644 --- a/src/vector_tile_util.hpp +++ b/src/vector_tile_util.hpp @@ -12,6 +12,7 @@ namespace vector_tile { namespace mapnik { namespace vector_tile_impl { MAPNIK_VECTOR_INLINE bool is_solid_extent(vector_tile::Tile const& tile, std::string & key); +MAPNIK_VECTOR_INLINE bool is_solid_extent(std::string const& tile, std::string & key); }} diff --git a/src/vector_tile_util.ipp b/src/vector_tile_util.ipp index f7dfe44..4f5976c 100644 --- a/src/vector_tile_util.ipp +++ b/src/vector_tile_util.ipp @@ -7,6 +7,11 @@ #include #include #include + +#include "vector_tile_geometry_decoder.hpp" + +#include + #include #include #include @@ -162,4 +167,97 @@ namespace mapnik { namespace vector_tile_impl { return true; } +bool is_solid_extent(std::string const& tile, std::string & key) +{ +protozero::pbf_reader item(tile.data(),tile.size()); +unsigned i = 0; +while (item.next()) { +if (item.tag() == 3) { +protozero::pbf_reader layer_msg = item.get_message(); +unsigned extent = 0; +std::string name; +std::vector feature_collection; +while (layer_msg.next()) +{ +switch(layer_msg.tag()) +{ +case 1: +name = layer_msg.get_string(); +break; +case 2: + feature_collection.push_back(layer_msg.get_message()); +break; +case 5: +extent = layer_msg.get_uint32(); +break; +default: +layer_msg.skip(); +break; +} +} +unsigned side = extent - 1; +mapnik::box2d container(2, 2, extent-2, extent-2); +double extent_area = side * side; +for (auto & features : feature_collection) +{ +while (features.next()) { +if (features.tag() == 4) { +mapnik::vector_tile_impl::GeometryPBF paths(features.get_packed_uint32(), 0, 0, 1, 1); +mapnik::vector_tile_impl::GeometryPBF::command cmd; +double x0, y0, x1, y1; +mapnik::box2d box; +bool first = true; +while ((cmd = paths.next(x1, y1)) != mapnik::vector_tile_impl::GeometryPBF::end) +{ +i
[mapnik-vector-tile] 08/15: Imported Upstream version 0.9.2+dfsg
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 9b742160076f0f9a097f81b891d4d3a2f8195b63 Author: Bas Couwenberg Date: Fri Sep 11 22:55:35 2015 +0200 Imported Upstream version 0.9.2+dfsg --- CHANGELOG.md| 6 + bench/enf.t5yd5cdi_14_13089_8506.vector.pbf | Bin 0 -> 1353537 bytes bench/multi_line_13_1310_3166.vector.pbf| Bin 0 -> 265593 bytes bench/notes.md | 58 bench/vtile-decode.cpp | 127 ++ gyp/build.gyp | 16 +++ package.json| 2 +- scripts/coverage.sh | 4 +- src/vector_tile_datasource.ipp | 9 +- src/vector_tile_datasource_pbf.ipp | 9 +- src/vector_tile_geometry_decoder.hpp| 200 src/vector_tile_geometry_encoder.hpp| 57 +++- src/vector_tile_processor.ipp | 16 +-- src/vector_tile_util.ipp| 3 +- test/encoding_util.hpp | 96 + test/geometry_encoding.cpp | 34 ++--- 16 files changed, 510 insertions(+), 127 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76c85ba..373fea1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.9.2 + + - Fixed multipoint encoding (#144) + - Optimized decoding by filtering geometry parts not within bbox (#146) + - Optimized decoding by calling `vector.reserve` before `vector.emplace_back` (#119) + ## 0.9.1 - Added `is_solid_extent` implementation based on protozero decoder diff --git a/bench/enf.t5yd5cdi_14_13089_8506.vector.pbf b/bench/enf.t5yd5cdi_14_13089_8506.vector.pbf new file mode 100644 index 000..587020c Binary files /dev/null and b/bench/enf.t5yd5cdi_14_13089_8506.vector.pbf differ diff --git a/bench/multi_line_13_1310_3166.vector.pbf b/bench/multi_line_13_1310_3166.vector.pbf new file mode 100644 index 000..00e258a Binary files /dev/null and b/bench/multi_line_13_1310_3166.vector.pbf differ diff --git a/bench/notes.md b/bench/notes.md new file mode 100644 index 000..7948c7f --- /dev/null +++ b/bench/notes.md @@ -0,0 +1,58 @@ +With reserve + +``` +$ ./build/Release/vtile-decode bench/multi_line_13_1310_3166.vector.pbf 13 1310 3166 +z:13 x:1310 y:3166 iterations:100 +message: zlib compressed +4026.30ms (cpu 4020.96ms) | decode as datasource_pbf: bench/multi_line_13_1310_3166.vector.pbf +``` + +without reserve code + +``` +$ ./build/Release/vtile-decode bench/multi_line_13_1310_3166.vector.pbf 13 1310 3166 +z:13 x:1310 y:3166 iterations:100 +message: zlib compressed +4296.88ms (cpu 4289.05ms) | decode as datasource_pbf: bench/multi_line_13_1310_3166.vector.pbf +``` + + +- + + +baseline (using mapnik::geometry::envelope + filter.pass) + +$ .//build/Release/vtile-decode bench/enf.t5yd5cdi_14_13089_8506.vector.pbf 14 13089 8506 200 +z:14 x:13089 y:8506 iterations:200 +2822.66ms (cpu 2821.10ms) | decode as datasource_pbf: bench/enf.t5yd5cdi_14_13089_8506.vector.pbf +2070.90ms (cpu 2070.44ms) | decode as datasource: bench/enf.t5yd5cdi_14_13089_8506.vector.pbf +processed 6800 features + +$ ./build/Release/vtile-decode bench/multi_line_13_1310_3166.vector.pbf 13 1310 3166 100 +z:13 x:1310 y:3166 iterations:100 +message: zlib compressed +4289.26ms (cpu 4275.29ms) | decode as datasource_pbf: bench/multi_line_13_1310_3166.vector.pbf + + + +commenting filter.pass/geometry::envelope in datasource_pbf + +$ .//build/Release/vtile-decode bench/enf.t5yd5cdi_14_13089_8506.vector.pbf 14 13089 8506 200 +z:14 x:13089 y:8506 iterations:200 +2305.45ms (cpu 2301.07ms) | decode as datasource_pbf: bench/enf.t5yd5cdi_14_13089_8506.vector.pbf +2142.56ms (cpu 2140.40ms) | decode as datasource: bench/enf.t5yd5cdi_14_13089_8506.vector.pbf +processed 6800 features + + +with bbox filter: + +$ .//build/Release/vtile-decode bench/enf.t5yd5cdi_14_13089_8506.vector.pbf 14 13089 8506 200 +z:14 x:13089 y:8506 iterations:200 +2497.01ms (cpu 2493.40ms) | decode as datasource_pbf: bench/enf.t5yd5cdi_14_13089_8506.vector.pbf +1753.55ms (cpu 1751.10ms) | decode as datasource: bench/enf.t5yd5cdi_14_13089_8506.vector.pbf +processed 6600 features + +$ ./build/Release/vtile-decode bench/multi_line_13_1310_3166.vector.pbf 13 1310 3166 100 +z:13 x:1310 y:3166 iterations:100 +message: zlib compressed +4090.67ms (cpu 4083.65ms) | decode as datasource_pbf: bench/multi_line_13_1310_3166.vector.pbf diff --git a/bench/vtile-decode.cpp b/bench/vtile-decode.cpp new file mode 100644 index 000..7dafbe5 --- /dev/null +++ b/bench/vtile-decode.cpp @@ -0,0 +1,127 @@ +#include +#include +#include "vector_tile_datasource_pbf.hpp" +#include "vector_tile_datasource.hpp" +#include "vector_tile_compression.hpp" + +#pragma GCC diagnostic push +#pra
[mapnik-vector-tile] 03/15: Imported Upstream version 0.8.3+dfsg
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 1e0d82855e0b1ae2095ceee78600c57bf24c967c Author: Bas Couwenberg Date: Fri Sep 11 22:55:09 2015 +0200 Imported Upstream version 0.8.3+dfsg --- CHANGELOG.md | 6 + Makefile | 2 +- examples/c++/tileinfo.cpp| 42 gyp/build.gyp| 8 -- package.json | 2 +- src/vector_tile_backend_pbf.hpp | 1 + src/vector_tile_backend_pbf.ipp | 5 ++-- src/vector_tile_datasource.ipp | 5 src/vector_tile_geometry_decoder.hpp | 5 src/vector_tile_geometry_encoder.hpp | 47 +--- src/vector_tile_processor.ipp| 8 +++--- src/vector_tile_util.ipp | 5 test/clipper_test.cpp| 5 ++-- test/encoding_util.hpp | 3 ++- test/test_utils.cpp | 11 - test/vector_tile.cpp | 13 +- test/vector_tile_pbf.cpp | 7 +- 17 files changed, 112 insertions(+), 63 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f40bc6..ad096c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.8.3 + + - Minor optimization in attribute encoding by using `emplace` instead of `insert` + - Now depends on `pbf_writer.hpp` for zigzag implementation (no change in behavior) + - Minor code cleanup to avoid unnecessary compiler warnings + ## 0.8.2 - Optimized coordinate transform that skips proj4 failures (#116) diff --git a/Makefile b/Makefile index a518b5a..58085e4 100755 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ MAPNIK_PLUGINDIR := $(shell mapnik-config --input-plugins) BUILDTYPE ?= Release -CLIPPER_REVISION=bfad32e +CLIPPER_REVISION=e0973e0802 PBF_REVISION=1df6453 GYP_REVISION=3464008 diff --git a/examples/c++/tileinfo.cpp b/examples/c++/tileinfo.cpp index 7a9ddca..fb1e532 100644 --- a/examples/c++/tileinfo.cpp +++ b/examples/c++/tileinfo.cpp @@ -83,16 +83,16 @@ int main(int argc, char** argv) } } if (!verbose) { -std::cout << "layers: " << tile.layers_size() << "\n"; -for (unsigned i=0;i(tile.layers_size()) << "\n"; +for (std::size_t i=0;i(tile.layers_size());++i) { vector_tile::Tile_Layer const& layer = tile.layers(i); std::cout << layer.name() << ":\n"; std::cout << " version: " << layer.version() << "\n"; std::cout << " extent: " << layer.extent() << "\n"; -std::cout << " features: " << layer.features_size() << "\n"; -std::cout << " keys: " << layer.keys_size() << "\n"; -std::cout << " values: " << layer.values_size() << "\n"; +std::cout << " features: " << static_cast(layer.features_size()) << "\n"; +std::cout << " keys: " << static_cast(layer.keys_size()) << "\n"; +std::cout << " values: " << static_cast(layer.values_size()) << "\n"; unsigned total_repeated = 0; unsigned num_commands = 0; unsigned num_move_to = 0; @@ -100,7 +100,7 @@ int main(int argc, char** argv) unsigned num_close = 0; unsigned num_empty = 0; unsigned degenerate = 0; -for (unsigned j=0;j(layer.features_size());++j) { vector_tile::Tile_Feature const & f = layer.features(j); total_repeated += f.geometry_size(); @@ -158,26 +158,26 @@ int main(int argc, char** argv) std::cout << "empty geoms: " << num_empty << "\n"; } } else { -for (unsigned i=0;i(tile.layers_size());++j) { -vector_tile::Tile_Layer const& layer = tile.layers(i); +vector_tile::Tile_Layer const& layer = tile.layers(j); std::cout << "layer: " << layer.name() << "\n"; std::cout << " version: " << layer.version() << "\n"; std::cout << " extent: " << layer.extent() << "\n"; std::cout << " keys: "; -for (unsigned i=0;i(layer.keys_size());++k) { - std::string const& key = layer.keys(i); + std::string const& key = layer.keys(k); std::cout << key; - if (i(layer.keys_size())-1) { std::cout << ","; } } std::cout << "\n"; std::cout << " values: "; -for (unsigned i=0;i(layer.values_size());++l) { - vector_tile::Tile_Value const & value = lay
[mapnik-vector-tile] 05/15: Imported Upstream version 0.8.5+dfsg
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 3fa1df4173cca95bc92383252ca1ad25fd63c412 Author: Bas Couwenberg Date: Fri Sep 11 22:55:20 2015 +0200 Imported Upstream version 0.8.5+dfsg --- .gitignore | 2 ++ .npmignore | 13 ++- CHANGELOG.md| 5 +++ CONTRIBUTING.md | 13 +++ Makefile| 6 bench/vtile-transform.cpp | 14 ++-- bootstrap.sh| 2 +- package.json| 2 +- src/vector_tile_datasource_pbf.ipp | 2 +- src/vector_tile_processor.hpp | 3 +- src/vector_tile_processor.ipp | 37 +--- src/vector_tile_strategy.hpp| 41 +++--- test/clipper_test.cpp | 12 +-- test/data/linestrings_and_point.geojson | 56 ++ test/test_utils.cpp | 9 + test/test_utils.hpp | 1 + test/vector_tile.cpp| 6 ++-- test/vector_tile_pbf.cpp| 61 + 18 files changed, 248 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index 02cdd31..3e38244 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ test/run-raster-test archive TODO.md examples/c++/tileinfo +.mason +mason_packages diff --git a/.npmignore b/.npmignore index d9382ea..77504b7 100644 --- a/.npmignore +++ b/.npmignore @@ -8,4 +8,15 @@ python/vector_tile_pb2.py test/run-test *pyc archive -TODO.md \ No newline at end of file +TODO.md +.mason +mason_packages +deps +build +.travis.yml +scripts +gyp +test +CONTRIBUTING.md +bootstrap.sh +bench diff --git a/CHANGELOG.md b/CHANGELOG.md index d38b756..1226381 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 0.8.5 + + - Remove geometries from clipping that never intersect with the bounding box of the tile (#135) + - Fix indexing error in tile_datasource_pbf (#132) + ## 0.8.4 - Started to skip coordinates that are out of range (#121) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000..d0a99ce --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,13 @@ +# Contributing + +General guidelines for contributing to mapnik-vector-tile + +## Releasing + +To release a new node-mapnik version: + + - Make sure that all tests as passing (including travis and appveyor tests). + - Update the CHANGELOG.md and commit new version. + - Create a github tag like `git tag -a v0.8.5 -m "v0.8.5"` + - Ensure you have a clean checkout (no extra files in your check that are not known by git). You need to be careful, for instance, to avoid a large accidental file being packaged by npm. You can get a view of what npm will publish by running `make testpack` + - Then publish the module to npm repositories by running `npm publish` diff --git a/Makefile b/Makefile index 58085e4..c3ee347 100755 --- a/Makefile +++ b/Makefile @@ -25,6 +25,12 @@ libvtile: build/Makefile Makefile test: libvtile ./build/$(BUILDTYPE)/tests +testpack: + rm -f ./*tgz + npm pack + tar -ztvf *tgz + rm -f ./*tgz + clean: rm -rf ./build diff --git a/bench/vtile-transform.cpp b/bench/vtile-transform.cpp index 772a90d..b716cc3 100644 --- a/bench/vtile-transform.cpp +++ b/bench/vtile-transform.cpp @@ -60,7 +60,11 @@ int main() { { mapnik::vector_tile_impl::vector_tile_strategy_proj vs(prj_trans,tr, 16); mapnik::progress_timer __stats__(std::clog, "transform_visitor with reserve with proj no-op"); - mapnik::vector_tile_impl::transform_visitor transit(vs); +mapnik::box2d clip_extent(std::numeric_limits::min(), + std::numeric_limits::min(), + std::numeric_limits::max(), + std::numeric_limits::max()); + mapnik::vector_tile_impl::transform_visitor transit(vs, clip_extent); for (unsigned i=0;i<1;++i) { mapnik::geometry::geometry new_geom = mapnik::util::apply_visitor(transit,geom); @@ -76,7 +80,11 @@ int main() { { mapnik::vector_tile_impl::vector_tile_strategy vs(tr, 16); mapnik::progress_timer __stats__(std::clog, "transform_visitor with reserve with no proj function call overhead"); - mapnik::vector_tile_impl::transform_visitor transit(vs); +mapnik::box2d clip_extent(std::numeric_limits::min(), + std::numeric_limits::min(), + std::numeric_limits::max(), + std::numeric_limits::max()); + mapnik::vector_tile_impl::transform_visitor tran
[mapnik-vector-tile] 13/15: Restructure control file with cme.
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 9164ad8dca64b6e5dca0ac8844c9f2b561bfa6af Author: Bas Couwenberg Date: Fri Sep 11 23:06:19 2015 +0200 Restructure control file with cme. --- debian/changelog | 1 + debian/control | 32 +++- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index fedff01..03b3fcc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ mapnik-vector-tile (0.10.0+dfsg-1) UNRELEASED; urgency=medium - Support other tarball extensions - Use repacksuffix option for appending +dfsg * Update Vcs-Browser URL to use cgit instead of gitweb. + * Restructure control file with cme. -- Bas Couwenberg Fri, 11 Sep 2015 23:04:17 +0200 diff --git a/debian/control b/debian/control index f06a957..f8df707 100644 --- a/debian/control +++ b/debian/control @@ -1,28 +1,26 @@ Source: mapnik-vector-tile -Section: devel -Priority: extra Maintainer: Debian GIS Project Uploaders: Jérémy Lal -Build-Depends: - debhelper (>= 9), - gyp, - protobuf-compiler, - libprotobuf-dev, - catch, - libmapnik-dev (>= 3.0.0~), - python, - python-gdal +Section: devel +Priority: extra +Build-Depends: debhelper (>= 9), + gyp, + protobuf-compiler, + libprotobuf-dev, + catch, + libmapnik-dev (>= 3.0.0~), + python, + python-gdal Standards-Version: 3.9.6 -Homepage: https://github.com/mapbox/mapnik-vector-tile -Vcs-Git: git://anonscm.debian.org/pkg-grass/mapnik-vector-tile.git Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/mapnik-vector-tile.git +Vcs-Git: git://anonscm.debian.org/pkg-grass/mapnik-vector-tile.git +Homepage: https://github.com/mapbox/mapnik-vector-tile Package: mapnik-vector-tile Architecture: all -Depends: - ${misc:Depends}, - libprotobuf-dev, - libmapnik-dev (>= 3.0.0~) +Depends: ${misc:Depends}, + libprotobuf-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 into vector tiles, and vector tiles into images. -- 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
[mapnik-vector-tile] branch pristine-tar updated (ef9bb82 -> 9fdccc1)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository mapnik-vector-tile. from ef9bb82 pristine-tar data for mapnik-vector-tile_0.8.0+dfsg.orig.tar.gz new c0546e2 pristine-tar data for mapnik-vector-tile_0.8.1+dfsg.orig.tar.gz new 8cce714 pristine-tar data for mapnik-vector-tile_0.8.2+dfsg.orig.tar.gz new 037042f pristine-tar data for mapnik-vector-tile_0.8.3+dfsg.orig.tar.gz new 7059f7a pristine-tar data for mapnik-vector-tile_0.8.4+dfsg.orig.tar.gz new 18d1c27 pristine-tar data for mapnik-vector-tile_0.8.5+dfsg.orig.tar.gz new 30e2b7b pristine-tar data for mapnik-vector-tile_0.9.0+dfsg.orig.tar.gz new 53a02d1 pristine-tar data for mapnik-vector-tile_0.9.1+dfsg.orig.tar.gz new 2908f40 pristine-tar data for mapnik-vector-tile_0.9.2+dfsg.orig.tar.gz new 536a3e6 pristine-tar data for mapnik-vector-tile_0.9.3+dfsg.orig.tar.gz new 9fdccc1 pristine-tar data for mapnik-vector-tile_0.10.0+dfsg.orig.tar.gz The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: mapnik-vector-tile_0.10.0+dfsg.orig.tar.gz.delta | Bin 0 -> 999244 bytes mapnik-vector-tile_0.10.0+dfsg.orig.tar.gz.id| 1 + mapnik-vector-tile_0.8.1+dfsg.orig.tar.gz.delta | Bin 0 -> 698554 bytes mapnik-vector-tile_0.8.1+dfsg.orig.tar.gz.id | 1 + mapnik-vector-tile_0.8.2+dfsg.orig.tar.gz.delta | Bin 0 -> 663110 bytes mapnik-vector-tile_0.8.2+dfsg.orig.tar.gz.id | 1 + mapnik-vector-tile_0.8.3+dfsg.orig.tar.gz.delta | Bin 0 -> 678392 bytes mapnik-vector-tile_0.8.3+dfsg.orig.tar.gz.id | 1 + mapnik-vector-tile_0.8.4+dfsg.orig.tar.gz.delta | Bin 0 -> 686304 bytes mapnik-vector-tile_0.8.4+dfsg.orig.tar.gz.id | 1 + mapnik-vector-tile_0.8.5+dfsg.orig.tar.gz.delta | Bin 0 -> 702316 bytes mapnik-vector-tile_0.8.5+dfsg.orig.tar.gz.id | 1 + mapnik-vector-tile_0.9.0+dfsg.orig.tar.gz.delta | Bin 0 -> 651047 bytes mapnik-vector-tile_0.9.0+dfsg.orig.tar.gz.id | 1 + mapnik-vector-tile_0.9.1+dfsg.orig.tar.gz.delta | Bin 0 -> 707664 bytes mapnik-vector-tile_0.9.1+dfsg.orig.tar.gz.id | 1 + mapnik-vector-tile_0.9.2+dfsg.orig.tar.gz.delta | Bin 0 -> 1011545 bytes mapnik-vector-tile_0.9.2+dfsg.orig.tar.gz.id | 1 + mapnik-vector-tile_0.9.3+dfsg.orig.tar.gz.delta | Bin 0 -> 829386 bytes mapnik-vector-tile_0.9.3+dfsg.orig.tar.gz.id | 1 + 20 files changed, 10 insertions(+) create mode 100644 mapnik-vector-tile_0.10.0+dfsg.orig.tar.gz.delta create mode 100644 mapnik-vector-tile_0.10.0+dfsg.orig.tar.gz.id create mode 100644 mapnik-vector-tile_0.8.1+dfsg.orig.tar.gz.delta create mode 100644 mapnik-vector-tile_0.8.1+dfsg.orig.tar.gz.id create mode 100644 mapnik-vector-tile_0.8.2+dfsg.orig.tar.gz.delta create mode 100644 mapnik-vector-tile_0.8.2+dfsg.orig.tar.gz.id create mode 100644 mapnik-vector-tile_0.8.3+dfsg.orig.tar.gz.delta create mode 100644 mapnik-vector-tile_0.8.3+dfsg.orig.tar.gz.id create mode 100644 mapnik-vector-tile_0.8.4+dfsg.orig.tar.gz.delta create mode 100644 mapnik-vector-tile_0.8.4+dfsg.orig.tar.gz.id create mode 100644 mapnik-vector-tile_0.8.5+dfsg.orig.tar.gz.delta create mode 100644 mapnik-vector-tile_0.8.5+dfsg.orig.tar.gz.id create mode 100644 mapnik-vector-tile_0.9.0+dfsg.orig.tar.gz.delta create mode 100644 mapnik-vector-tile_0.9.0+dfsg.orig.tar.gz.id create mode 100644 mapnik-vector-tile_0.9.1+dfsg.orig.tar.gz.delta create mode 100644 mapnik-vector-tile_0.9.1+dfsg.orig.tar.gz.id create mode 100644 mapnik-vector-tile_0.9.2+dfsg.orig.tar.gz.delta create mode 100644 mapnik-vector-tile_0.9.2+dfsg.orig.tar.gz.id create mode 100644 mapnik-vector-tile_0.9.3+dfsg.orig.tar.gz.delta create mode 100644 mapnik-vector-tile_0.9.3+dfsg.orig.tar.gz.id -- 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
[mapnik-vector-tile] 06/15: Imported Upstream version 0.9.0+dfsg
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 ae7ec37b708c67bc57061794c79f1a0ddfb1fc37 Author: Bas Couwenberg Date: Fri Sep 11 22:55:25 2015 +0200 Imported Upstream version 0.9.0+dfsg --- CHANGELOG.md | 5 CONTRIBUTING.md | 3 ++- Makefile | 8 +++ gyp/build.gyp| 12 +- package.json | 2 +- src/vector_tile_datasource_pbf.hpp | 8 +++ src/vector_tile_datasource_pbf.ipp | 46 ++-- src/vector_tile_geometry_decoder.hpp | 8 +++ src/vector_tile_geometry_encoder.hpp | 14 +-- test/vector_tile.cpp | 4 ++-- test/vector_tile_pbf.cpp | 46 ++-- 11 files changed, 81 insertions(+), 75 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1226381..79e0380 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 0.9.0 + + - Upgraded to protozero v1.0.0 + - Fixed attribute handling bug in tile_datasource_pbf + ## 0.8.5 - Remove geometries from clipping that never intersect with the bounding box of the tile (#135) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d0a99ce..ad498ac 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,7 +7,8 @@ General guidelines for contributing to mapnik-vector-tile To release a new node-mapnik version: - Make sure that all tests as passing (including travis and appveyor tests). - - Update the CHANGELOG.md and commit new version. + - Update the CHANGELOG.md + - Make a "bump commit" by updating the version in `package.json` and adding a commit like `-m "bump to v0.8.5"` - Create a github tag like `git tag -a v0.8.5 -m "v0.8.5"` - Ensure you have a clean checkout (no extra files in your check that are not known by git). You need to be careful, for instance, to avoid a large accidental file being packaged by npm. You can get a view of what npm will publish by running `make testpack` - Then publish the module to npm repositories by running `npm publish` diff --git a/Makefile b/Makefile index c3ee347..27454c1 100755 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ MAPNIK_PLUGINDIR := $(shell mapnik-config --input-plugins) BUILDTYPE ?= Release CLIPPER_REVISION=e0973e0802 -PBF_REVISION=1df6453 +PROTOZERO_REVISION=v1.0.0 GYP_REVISION=3464008 all: libvtile @@ -10,13 +10,13 @@ all: libvtile ./deps/gyp: git clone https://chromium.googlesource.com/external/gyp.git ./deps/gyp && cd ./deps/gyp && git checkout $(GYP_REVISION) -./deps/pbf: - git clone https://github.com/mapbox/pbf.hpp.git ./deps/pbf && cd ./deps/pbf && git checkout $(PBF_REVISION) +./deps/protozero: + git clone https://github.com/mapbox/protozero.git ./deps/protozero && cd ./deps/protozero && git checkout $(PROTOZERO_REVISION) ./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/pbf gyp/build.gyp test/*cpp +build/Makefile: ./deps/gyp ./deps/clipper ./deps/protozero 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 diff --git a/gyp/build.gyp b/gyp/build.gyp index 5f363e6..a9d8a5f 100644 --- a/gyp/build.gyp +++ b/gyp/build.gyp @@ -42,7 +42,7 @@ ], 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/', -'../deps/pbf' +'../deps/protozero/include' ], 'cflags_cc' : [ '-D_THREAD_SAFE', @@ -61,7 +61,7 @@ 'direct_dependent_settings': { 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/', - '../deps/pbf' + '../deps/protozero/include' ], 'libraries':[ '-lprotobuf-lite' @@ -92,7 +92,7 @@ ' #include -#include "pbf_reader.hpp" +#include namespace mapnik { namespace vector_tile_impl { @@ -14,7 +14,7 @@ namespace mapnik { namespace vector_tile_impl { class tile_datasource_pbf : public datasource { public: -tile_datasource_pbf(mapbox::util::pbf const& layer, +tile_datasource_pbf(protozero::pbf_reader const& layer, unsigned x, unsigned y, unsigned z, @@ -32,7 +32,7 @@ namespace mapnik { namespace vector_tile_impl { private: mutable mapnik::layer_descriptor desc_; mutable bool attributes_added_; -mapbox::util::pbf layer_; +protozero::pbf_reader layer_; unsigned x_; unsigned y_; unsigned z_; @@ -45,7 +45,7 @@ namespace mapnik { namespace vector_tile_impl {
[mapnik-vector-tile] 15/15: Use protobuf Debian package.
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 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 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 000..54e3b4e --- /dev/null +++ b/debian/patches/use-protozero-package.patch @@ -0,0 +1,80 @@ +Description: Use protobuf Debian package. +Author: Bas Couwenberg +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 @@ + '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 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapnik-vector-tile] 14/15: Refresh patches.
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 2e4298d18f4fe20a9706d2b9846e65bc2ce5e496 Author: Bas Couwenberg Date: Fri Sep 11 23:09:36 2015 +0200 Refresh patches. --- debian/patches/test_using_created_tif.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/patches/test_using_created_tif.patch b/debian/patches/test_using_created_tif.patch index 9e0f5a9..55511f6 100644 --- a/debian/patches/test_using_created_tif.patch +++ b/debian/patches/test_using_created_tif.patch @@ -4,9 +4,10 @@ Description: test using a tif created at build time Author: Jérémy Lal Last-Update: 2014-08-20 Forwarded: not-needed + --- a/test/raster_tile.cpp +++ b/test/raster_tile.cpp -@@ -87,8 +87,8 @@ +@@ -86,8 +86,8 @@ TEST_CASE( "raster tile output 1", "shou mapnik::save_to_file(im_data,"test/fixtures/actual-2.jpeg","jpeg"); } -- 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
[mapnik-vector-tile] 12/15: Imported upstream version 0.10.0+dfsg.
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 7f4f6212d9c119df4af9964f469db0fb4a3d40f4 Author: Bas Couwenberg Date: Fri Sep 11 23:05:23 2015 +0200 Imported upstream version 0.10.0+dfsg. --- debian/changelog | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ebf89df..fedff01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,6 @@ -mapnik-vector-tile (0.8.0+dfsg-1) UNRELEASED; urgency=medium +mapnik-vector-tile (0.10.0+dfsg-1) UNRELEASED; urgency=medium + + * Team upload. [ Jérémy Lal ] * Imported Upstream version 0.8.0+dfsg @@ -6,6 +8,7 @@ mapnik-vector-tile (0.8.0+dfsg-1) UNRELEASED; urgency=medium * Fixed watch file [ Bas Couwenberg ] + * Imported upstream version 0.10.0+dfsg. * Add gbp.conf to use pristine-tar by default. * Update watch file, changes: - Handle common versionmangle issues @@ -13,7 +16,7 @@ mapnik-vector-tile (0.8.0+dfsg-1) UNRELEASED; urgency=medium - Use repacksuffix option for appending +dfsg * Update Vcs-Browser URL to use cgit instead of gitweb. - -- Jérémy Lal Wed, 27 May 2015 22:06:37 +0200 + -- Bas Couwenberg Fri, 11 Sep 2015 23:04:17 +0200 mapnik-vector-tile (0.5.1+dfsg-2) unstable; urgency=medium -- 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
[mapnik-vector-tile] 02/10: pristine-tar data for mapnik-vector-tile_0.8.2+dfsg.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository mapnik-vector-tile. commit 8cce714ab6fb9fe6468d7fc86292fd3849cf7d2c Author: Bas Couwenberg Date: Fri Sep 11 22:55:08 2015 +0200 pristine-tar data for mapnik-vector-tile_0.8.2+dfsg.orig.tar.gz --- mapnik-vector-tile_0.8.2+dfsg.orig.tar.gz.delta | Bin 0 -> 663110 bytes mapnik-vector-tile_0.8.2+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/mapnik-vector-tile_0.8.2+dfsg.orig.tar.gz.delta b/mapnik-vector-tile_0.8.2+dfsg.orig.tar.gz.delta new file mode 100644 index 000..c50135f Binary files /dev/null and b/mapnik-vector-tile_0.8.2+dfsg.orig.tar.gz.delta differ diff --git a/mapnik-vector-tile_0.8.2+dfsg.orig.tar.gz.id b/mapnik-vector-tile_0.8.2+dfsg.orig.tar.gz.id new file mode 100644 index 000..e857fb3 --- /dev/null +++ b/mapnik-vector-tile_0.8.2+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +ec63d4b6a041374d47d6f35741195713332a1c43 -- 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
[mapnik-vector-tile] 11/15: Merge tag 'upstream/0.10.0+dfsg'
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 299a046ef63347bd71a00e63bbe79a7005d55133 Merge: c9c018d ec8da71 Author: Bas Couwenberg Date: Fri Sep 11 22:56:35 2015 +0200 Merge tag 'upstream/0.10.0+dfsg' Upstream version 0.10.0+dfsg .gitignore | 2 + .npmignore | 13 +- .travis.yml | 4 + CHANGELOG.md | 56 ++ CONTRIBUTING.md | 15 + Makefile | 20 +- README.md| 2 +- bench/enf.t5yd5cdi_14_13089_8506.vector.pbf | Bin 0 -> 1353537 bytes bench/multi_line_13_1310_3166.vector.pbf | Bin 0 -> 265593 bytes bench/notes.md | 58 +++ bench/vtile-decode.cpp | 127 + bench/vtile-transform.cpp| 101 bootstrap.sh | 2 +- examples/c++/tileinfo.cpp| 45 +- gyp/build.gyp| 78 ++- package.json | 2 +- scripts/build.sh | 2 + scripts/coverage.sh | 4 +- src/vector_tile_backend_pbf.hpp | 17 +- src/vector_tile_backend_pbf.ipp | 7 +- src/vector_tile_compression.hpp | 15 +- src/vector_tile_compression.ipp | 32 +- src/vector_tile_datasource.ipp | 15 +- src/vector_tile_datasource_pbf.cpp | 2 + src/vector_tile_datasource_pbf.hpp | 59 +++ src/vector_tile_datasource_pbf.ipp | 420 +++ src/vector_tile_geometry_decoder.hpp | 552 ++-- src/vector_tile_geometry_encoder.hpp | 134 +++-- src/vector_tile_processor.hpp| 15 +- src/vector_tile_processor.ipp| 379 +++--- src/vector_tile_strategy.hpp | 288 +++ src/vector_tile_util.hpp | 1 + src/vector_tile_util.ipp | 104 test/clipper_test.cpp| 191 +++ test/data/NZ_Coastline_NZMG.dbf | Bin 0 -> 143 bytes test/data/NZ_Coastline_NZMG.prj | 1 + test/data/NZ_Coastline_NZMG.qpj | 1 + test/data/NZ_Coastline_NZMG.shp | Bin 0 -> 1268 bytes test/data/NZ_Coastline_NZMG.shx | Bin 0 -> 116 bytes test/data/invalid-interior-ring.json | 95 test/data/linestrings_and_point.geojson | 56 ++ test/data/natural_earth.tif | Bin 3299605 -> 0 bytes test/data/poly-lat-invalid-4269.dbf | Bin 0 -> 77 bytes test/data/poly-lat-invalid-4269.prj | 1 + test/data/poly-lat-invalid-4269.shp | Bin 0 -> 316 bytes test/data/poly-lat-invalid-4269.shx | Bin 0 -> 108 bytes test/data/polygon-style.xml | 7 + test/data/tile_with_extra_feature_field.pbf | 2 + test/data/tile_with_extra_field.pbf | 2 + test/data/tile_with_extra_layer_fields.pbf | 2 + test/data/tile_with_invalid_layer_value_type.pbf | 2 + test/data/tile_with_unexpected_geomtype.pbf | 3 + test/encoding_util.hpp | 102 ++-- test/fixtures/transform-expected-1.png | Bin 0 -> 2374 bytes test/geometry_encoding.cpp | 176 +++ test/raster_tile.cpp | 2 - test/test_main.cpp | 11 +- test/test_utils.cpp | 52 +- test/test_utils.hpp | 2 + test/vector_tile.cpp | 317 ++-- test/vector_tile_pbf.cpp | 624 +++ 61 files changed, 3551 insertions(+), 669 deletions(-) -- 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
[mapnik-vector-tile] 01/10: pristine-tar data for mapnik-vector-tile_0.8.1+dfsg.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository mapnik-vector-tile. commit c0546e2f066af9be23dcec79a2e6d654833fb9f8 Author: Bas Couwenberg Date: Fri Sep 11 22:55:03 2015 +0200 pristine-tar data for mapnik-vector-tile_0.8.1+dfsg.orig.tar.gz --- mapnik-vector-tile_0.8.1+dfsg.orig.tar.gz.delta | Bin 0 -> 698554 bytes mapnik-vector-tile_0.8.1+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/mapnik-vector-tile_0.8.1+dfsg.orig.tar.gz.delta b/mapnik-vector-tile_0.8.1+dfsg.orig.tar.gz.delta new file mode 100644 index 000..feabb54 Binary files /dev/null and b/mapnik-vector-tile_0.8.1+dfsg.orig.tar.gz.delta differ diff --git a/mapnik-vector-tile_0.8.1+dfsg.orig.tar.gz.id b/mapnik-vector-tile_0.8.1+dfsg.orig.tar.gz.id new file mode 100644 index 000..d1742ab --- /dev/null +++ b/mapnik-vector-tile_0.8.1+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +0d1d2ae26c3c832f4ccfbf7b9f8cb742cbb65353 -- 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
[mapnik-vector-tile] 09/15: Imported Upstream version 0.9.3+dfsg
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 310997b1c8b268e108bf58514eda130505eb79a7 Author: Bas Couwenberg Date: Fri Sep 11 22:55:51 2015 +0200 Imported Upstream version 0.9.3+dfsg --- CHANGELOG.md| 4 package.json| 2 +- src/vector_tile_compression.hpp | 15 ++- src/vector_tile_compression.ipp | 32 +--- 4 files changed, 40 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 373fea1..d1ed0ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.9.3 + + - Improvements to zlib compression API + ## 0.9.2 - Fixed multipoint encoding (#144) diff --git a/package.json b/package.json index b0b90a6..cb09d04 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mapnik-vector-tile", -"version": "0.9.2", +"version": "0.9.3", "description": "Mapnik vector tile API", "main": "./package.json", "repository" : { diff --git a/src/vector_tile_compression.hpp b/src/vector_tile_compression.hpp index 09c57b8..65205de 100644 --- a/src/vector_tile_compression.hpp +++ b/src/vector_tile_compression.hpp @@ -3,14 +3,25 @@ #include #include "vector_tile_config.hpp" +#include namespace mapnik { namespace vector_tile_impl { +inline bool is_zlib_compressed(const char * data, std::size_t size) +{ +return size > 2 && static_cast(data[0]) == 0x78 && static_cast(data[1]) == 0x9C; +} + inline bool is_zlib_compressed(std::string const& data) { return data.size() > 2 && static_cast(data[0]) == 0x78 && static_cast(data[1]) == 0x9C; } +inline bool is_gzip_compressed(const char * data, std::size_t size) +{ +return size > 2 && static_cast(data[0]) == 0x1F && static_cast(data[1]) == 0x8B; +} + inline bool is_gzip_compressed(std::string const& data) { return data.size() > 2 && static_cast(data[0]) == 0x1F && static_cast(data[1]) == 0x8B; @@ -19,7 +30,9 @@ inline bool is_gzip_compressed(std::string const& data) // decodes both zlib and gzip // http://stackoverflow.com/a/1838702/254 MAPNIK_VECTOR_INLINE void zlib_decompress(std::string const& input, std::string & output); -MAPNIK_VECTOR_INLINE void zlib_compress(std::string const& input, std::string & output, bool gzip=true); +MAPNIK_VECTOR_INLINE void zlib_compress(std::string const& input, std::string & output, bool gzip=true, int level=Z_DEFAULT_COMPRESSION, int strategy=Z_DEFAULT_STRATEGY); +MAPNIK_VECTOR_INLINE void zlib_decompress(const char * data, std::size_t size, std::string & output); +MAPNIK_VECTOR_INLINE void zlib_compress(const char * data, std::size_t size, std::string & output, bool gzip=true, int level=Z_DEFAULT_COMPRESSION, int strategy=Z_DEFAULT_STRATEGY); }} // end ns diff --git a/src/vector_tile_compression.ipp b/src/vector_tile_compression.ipp index 03a539c..75fd369 100644 --- a/src/vector_tile_compression.ipp +++ b/src/vector_tile_compression.ipp @@ -5,7 +5,7 @@ namespace mapnik { namespace vector_tile_impl { // decodes both zlib and gzip // http://stackoverflow.com/a/1838702/254 -void zlib_decompress(std::string const& input, std::string & output) +void zlib_decompress(const char * data, std::size_t size, std::string & output) { z_stream inflate_s; inflate_s.zalloc = Z_NULL; @@ -14,25 +14,30 @@ void zlib_decompress(std::string const& input, std::string & output) inflate_s.avail_in = 0; inflate_s.next_in = Z_NULL; inflateInit2(&inflate_s, 32 + 15); -inflate_s.next_in = (Bytef *)input.data(); -inflate_s.avail_in = input.size(); +inflate_s.next_in = (Bytef *)data; +inflate_s.avail_in = size; size_t length = 0; do { -output.resize(length + 2 * input.size()); -inflate_s.avail_out = 2 * input.size(); +output.resize(length + 2 * size); +inflate_s.avail_out = 2 * size; inflate_s.next_out = (Bytef *)(output.data() + length); int ret = inflate(&inflate_s, Z_FINISH); if (ret != Z_STREAM_END && ret != Z_OK && ret != Z_BUF_ERROR) { throw std::runtime_error(inflate_s.msg); } -length += (2 * input.size() - inflate_s.avail_out); +length += (2 * size - inflate_s.avail_out); } while (inflate_s.avail_out == 0); inflateEnd(&inflate_s); output.resize(length); } -void zlib_compress(std::string const& input, std::string & output, bool gzip) +void zlib_decompress(std::string const& input, std::string & output) +{ +zlib_decompress(input.data(),input.size(),output); +} + +void zlib_compress(const char * data, std::size_t size, std::string & output, bool gzip, int level, int strategy) { z_stream deflate_s; deflate_s.zalloc = Z_NULL; @@ -45,15 +50,15 @@ void zlib_compress(std::string const& input, std::string & output, bool gzip) { w
[mapnik-vector-tile] 10/15: Imported Upstream version 0.10.0+dfsg
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 ec8da7160e817050d279e0c7ee57c49e59ec3bf2 Author: Bas Couwenberg Date: Fri Sep 11 22:56:20 2015 +0200 Imported Upstream version 0.10.0+dfsg --- CHANGELOG.md | 4 + package.json | 2 +- src/vector_tile_backend_pbf.hpp | 5 +- src/vector_tile_geometry_encoder.hpp | 82 ++- src/vector_tile_processor.hpp| 10 +-- src/vector_tile_processor.ipp| 149 +-- test/vector_tile_pbf.cpp | 39 - 7 files changed, 162 insertions(+), 129 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1ed0ca..aaadafc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.10.0 + + - Changed the way painted is determined. Painted could not be marked as true but a vector tile would still be empty. + ## 0.9.3 - Improvements to zlib compression API diff --git a/package.json b/package.json index cb09d04..132131c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mapnik-vector-tile", -"version": "0.9.3", +"version": "0.10.0", "description": "Mapnik vector tile API", "main": "./package.json", "repository" : { diff --git a/src/vector_tile_backend_pbf.hpp b/src/vector_tile_backend_pbf.hpp index 0090663..510a323 100644 --- a/src/vector_tile_backend_pbf.hpp +++ b/src/vector_tile_backend_pbf.hpp @@ -48,7 +48,7 @@ namespace mapnik { namespace vector_tile_impl { inline void stop_tile_layer() {} template -inline unsigned add_path(T const& path) +inline bool add_path(T const& path) { if (current_feature_) { @@ -57,7 +57,8 @@ namespace mapnik { namespace vector_tile_impl { x_, y_); } -return 0; +// no path was added return false +return false; } }; diff --git a/src/vector_tile_geometry_encoder.hpp b/src/vector_tile_geometry_encoder.hpp index ea6edd1..42cdbdd 100644 --- a/src/vector_tile_geometry_encoder.hpp +++ b/src/vector_tile_geometry_encoder.hpp @@ -19,7 +19,7 @@ namespace mapnik { namespace vector_tile_impl { -inline unsigned encode_geometry(mapnik::geometry::point const& pt, +inline bool encode_geometry(mapnik::geometry::point const& pt, vector_tile::Tile_Feature & current_feature, int32_t & start_x, int32_t & start_y) @@ -32,7 +32,7 @@ inline unsigned encode_geometry(mapnik::geometry::point const& pt, current_feature.add_geometry(protozero::encode_zigzag32(dy)); start_x = pt.x; start_y = pt.y; -return 1; +return true; } inline unsigned encode_length(unsigned len) @@ -40,7 +40,7 @@ inline unsigned encode_length(unsigned len) return (len << 3u) | 2u; } -inline unsigned encode_geometry(mapnik::geometry::line_string const& line, +inline bool encode_geometry(mapnik::geometry::line_string const& line, vector_tile::Tile_Feature & current_feature, int32_t & start_x, int32_t & start_y) @@ -48,7 +48,7 @@ inline unsigned encode_geometry(mapnik::geometry::line_string cons std::size_t line_size = line.size(); if (line_size <= 0) { -return 0; +return false; } unsigned line_to_length = static_cast(line_size) - 1; @@ -78,10 +78,10 @@ inline unsigned encode_geometry(mapnik::geometry::line_string cons start_x = pt.x; start_y = pt.y; } -return line.size(); +return true; } -inline unsigned encode_geometry(mapnik::geometry::linear_ring const& ring, +inline bool encode_geometry(mapnik::geometry::linear_ring const& ring, vector_tile::Tile_Feature & current_feature, int32_t & start_x, int32_t & start_y) @@ -89,7 +89,7 @@ inline unsigned encode_geometry(mapnik::geometry::linear_ring cons std::size_t ring_size = ring.size(); if (ring_size < 3) { -return 0; +return false; } unsigned line_to_length = static_cast(ring_size) - 1; unsigned count = 0; @@ -105,7 +105,7 @@ inline unsigned encode_geometry(mapnik::geometry::linear_ring cons line_to_length -= 1; if (line_to_length < 2) { -return 0; +return false; } } @@ -135,36 +135,34 @@ inline unsigned encode_geometry(mapnik::geometry::linear_ring cons ++count; } current_feature.add_geometry(15); // close_path -return line_to_length; +return true; } -inline unsigned encode_geometry(mapnik::geometry::polygon const& poly, -
[mapnik-vector-tile] 04/10: pristine-tar data for mapnik-vector-tile_0.8.4+dfsg.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository mapnik-vector-tile. commit 7059f7a170f67cf900a624425cd6d9041260ab0b Author: Bas Couwenberg Date: Fri Sep 11 22:55:19 2015 +0200 pristine-tar data for mapnik-vector-tile_0.8.4+dfsg.orig.tar.gz --- mapnik-vector-tile_0.8.4+dfsg.orig.tar.gz.delta | Bin 0 -> 686304 bytes mapnik-vector-tile_0.8.4+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/mapnik-vector-tile_0.8.4+dfsg.orig.tar.gz.delta b/mapnik-vector-tile_0.8.4+dfsg.orig.tar.gz.delta new file mode 100644 index 000..0a4577c Binary files /dev/null and b/mapnik-vector-tile_0.8.4+dfsg.orig.tar.gz.delta differ diff --git a/mapnik-vector-tile_0.8.4+dfsg.orig.tar.gz.id b/mapnik-vector-tile_0.8.4+dfsg.orig.tar.gz.id new file mode 100644 index 000..1b8a9d6 --- /dev/null +++ b/mapnik-vector-tile_0.8.4+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +e45f21266f7634a47d51b0e2e2003ef2fac3bf98 -- 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
[mapnik-vector-tile] 03/10: pristine-tar data for mapnik-vector-tile_0.8.3+dfsg.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository mapnik-vector-tile. commit 037042f0b6aae226d84d3ea0203ae61425fd13c9 Author: Bas Couwenberg Date: Fri Sep 11 22:55:14 2015 +0200 pristine-tar data for mapnik-vector-tile_0.8.3+dfsg.orig.tar.gz --- mapnik-vector-tile_0.8.3+dfsg.orig.tar.gz.delta | Bin 0 -> 678392 bytes mapnik-vector-tile_0.8.3+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/mapnik-vector-tile_0.8.3+dfsg.orig.tar.gz.delta b/mapnik-vector-tile_0.8.3+dfsg.orig.tar.gz.delta new file mode 100644 index 000..7ae7cb7 Binary files /dev/null and b/mapnik-vector-tile_0.8.3+dfsg.orig.tar.gz.delta differ diff --git a/mapnik-vector-tile_0.8.3+dfsg.orig.tar.gz.id b/mapnik-vector-tile_0.8.3+dfsg.orig.tar.gz.id new file mode 100644 index 000..7b88956 --- /dev/null +++ b/mapnik-vector-tile_0.8.3+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +27af7ae8ef08880d0c5a53a3b3d0498d2e8fb893 -- 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
[mapnik-vector-tile] 05/10: pristine-tar data for mapnik-vector-tile_0.8.5+dfsg.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository mapnik-vector-tile. commit 18d1c2778ee76b63b9de599b818cd531dd0d3631 Author: Bas Couwenberg Date: Fri Sep 11 22:55:24 2015 +0200 pristine-tar data for mapnik-vector-tile_0.8.5+dfsg.orig.tar.gz --- mapnik-vector-tile_0.8.5+dfsg.orig.tar.gz.delta | Bin 0 -> 702316 bytes mapnik-vector-tile_0.8.5+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/mapnik-vector-tile_0.8.5+dfsg.orig.tar.gz.delta b/mapnik-vector-tile_0.8.5+dfsg.orig.tar.gz.delta new file mode 100644 index 000..a353096 Binary files /dev/null and b/mapnik-vector-tile_0.8.5+dfsg.orig.tar.gz.delta differ diff --git a/mapnik-vector-tile_0.8.5+dfsg.orig.tar.gz.id b/mapnik-vector-tile_0.8.5+dfsg.orig.tar.gz.id new file mode 100644 index 000..c52f4f2 --- /dev/null +++ b/mapnik-vector-tile_0.8.5+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +312d5a4051099e45d5f0031d54e7c7b2e4ead5ba -- 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
[mapnik-vector-tile] branch upstream updated (c7a1ef3 -> ec8da71)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository mapnik-vector-tile. from c7a1ef3 Imported Upstream version 0.8.0+dfsg new 49f807b Imported Upstream version 0.8.1+dfsg new ac61df0 Imported Upstream version 0.8.2+dfsg new 1e0d828 Imported Upstream version 0.8.3+dfsg new 137d9fd Imported Upstream version 0.8.4+dfsg new 3fa1df4 Imported Upstream version 0.8.5+dfsg new ae7ec37 Imported Upstream version 0.9.0+dfsg new 7208ca5 Imported Upstream version 0.9.1+dfsg new 9b74216 Imported Upstream version 0.9.2+dfsg new 310997b Imported Upstream version 0.9.3+dfsg new ec8da71 Imported Upstream version 0.10.0+dfsg The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: .gitignore | 2 + .npmignore | 13 +- .travis.yml| 4 + CHANGELOG.md | 56 ++ CONTRIBUTING.md| 15 + Makefile | 20 +- README.md | 2 +- bench/enf.t5yd5cdi_14_13089_8506.vector.pbf| Bin 0 -> 1353537 bytes bench/multi_line_13_1310_3166.vector.pbf | Bin 0 -> 265593 bytes bench/notes.md | 58 ++ bench/vtile-decode.cpp | 127 + bench/vtile-transform.cpp | 101 bootstrap.sh | 2 +- examples/c++/tileinfo.cpp | 45 +- gyp/build.gyp | 78 ++- package.json | 2 +- scripts/build.sh | 2 + scripts/coverage.sh| 4 +- src/vector_tile_backend_pbf.hpp| 17 +- src/vector_tile_backend_pbf.ipp| 7 +- src/vector_tile_compression.hpp| 15 +- src/vector_tile_compression.ipp| 32 +- src/vector_tile_datasource.ipp | 15 +- src/vector_tile_datasource_pbf.cpp | 2 + ...tasource.hpp => vector_tile_datasource_pbf.hpp} | 33 +- src/vector_tile_datasource_pbf.ipp | 420 ++ src/vector_tile_geometry_decoder.hpp | 552 -- src/vector_tile_geometry_encoder.hpp | 134 - src/vector_tile_processor.hpp | 15 +- src/vector_tile_processor.ipp | 379 +++-- src/vector_tile_strategy.hpp | 288 ++ src/vector_tile_util.hpp | 1 + src/vector_tile_util.ipp | 104 test/clipper_test.cpp | 191 +++ test/data/NZ_Coastline_NZMG.dbf| Bin 0 -> 143 bytes test/data/NZ_Coastline_NZMG.prj| 1 + test/data/NZ_Coastline_NZMG.qpj| 1 + test/data/NZ_Coastline_NZMG.shp| Bin 0 -> 1268 bytes test/data/NZ_Coastline_NZMG.shx| Bin 0 -> 116 bytes test/data/invalid-interior-ring.json | 95 test/data/linestrings_and_point.geojson| 56 ++ test/data/natural_earth.tif| Bin 3299605 -> 0 bytes test/data/poly-lat-invalid-4269.dbf| Bin 0 -> 77 bytes test/data/poly-lat-invalid-4269.prj| 1 + test/data/poly-lat-invalid-4269.shp| Bin 0 -> 316 bytes test/data/poly-lat-invalid-4269.shx| Bin 0 -> 108 bytes test/data/{raster_style.xml => polygon-style.xml} | 2 +- test/data/tile_with_extra_feature_field.pbf| 2 + test/data/tile_with_extra_field.pbf| 2 + test/data/tile_with_extra_layer_fields.pbf | 2 + test/data/tile_with_invalid_layer_value_type.pbf | 2 + test/data/tile_with_unexpected_geomtype.pbf| 3 + test/encoding_util.hpp | 102 ++-- test/fixtures/transform-expected-1.png | Bin 0 -> 2374 bytes test/geometry_encoding.cpp | 176 +++--- test/raster_tile.cpp | 2 - test/test_main.cpp | 11 +- test/test_utils.cpp| 52 +- test/test_utils.hpp| 2 + test/vector_tile.cpp | 317 +-- test/vector_tile_pbf.cpp | 624 + 61 files c
[mapnik-vector-tile] 09/10: pristine-tar data for mapnik-vector-tile_0.9.3+dfsg.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository mapnik-vector-tile. commit 536a3e6fadfbf49884822912c6baa21ea1167112 Author: Bas Couwenberg Date: Fri Sep 11 22:56:06 2015 +0200 pristine-tar data for mapnik-vector-tile_0.9.3+dfsg.orig.tar.gz --- mapnik-vector-tile_0.9.3+dfsg.orig.tar.gz.delta | Bin 0 -> 829386 bytes mapnik-vector-tile_0.9.3+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/mapnik-vector-tile_0.9.3+dfsg.orig.tar.gz.delta b/mapnik-vector-tile_0.9.3+dfsg.orig.tar.gz.delta new file mode 100644 index 000..edf179f Binary files /dev/null and b/mapnik-vector-tile_0.9.3+dfsg.orig.tar.gz.delta differ diff --git a/mapnik-vector-tile_0.9.3+dfsg.orig.tar.gz.id b/mapnik-vector-tile_0.9.3+dfsg.orig.tar.gz.id new file mode 100644 index 000..f7725c0 --- /dev/null +++ b/mapnik-vector-tile_0.9.3+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +6543553998ffe9351c25f14a2de8da5b870e933f -- 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
[mapnik-vector-tile] 07/10: pristine-tar data for mapnik-vector-tile_0.9.1+dfsg.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository mapnik-vector-tile. commit 53a02d132eb5078ddf372ae3c2c81db364c71aae Author: Bas Couwenberg Date: Fri Sep 11 22:55:34 2015 +0200 pristine-tar data for mapnik-vector-tile_0.9.1+dfsg.orig.tar.gz --- mapnik-vector-tile_0.9.1+dfsg.orig.tar.gz.delta | Bin 0 -> 707664 bytes mapnik-vector-tile_0.9.1+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/mapnik-vector-tile_0.9.1+dfsg.orig.tar.gz.delta b/mapnik-vector-tile_0.9.1+dfsg.orig.tar.gz.delta new file mode 100644 index 000..d8f49eb Binary files /dev/null and b/mapnik-vector-tile_0.9.1+dfsg.orig.tar.gz.delta differ diff --git a/mapnik-vector-tile_0.9.1+dfsg.orig.tar.gz.id b/mapnik-vector-tile_0.9.1+dfsg.orig.tar.gz.id new file mode 100644 index 000..bef2875 --- /dev/null +++ b/mapnik-vector-tile_0.9.1+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +af0d59fa0e3e36738ce9ff6c59c9a715cfb7460c -- 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
[mapnik-vector-tile] 06/10: pristine-tar data for mapnik-vector-tile_0.9.0+dfsg.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository mapnik-vector-tile. commit 30e2b7b7219fe45d86a386b0bb17bb0bf805023a Author: Bas Couwenberg Date: Fri Sep 11 22:55:29 2015 +0200 pristine-tar data for mapnik-vector-tile_0.9.0+dfsg.orig.tar.gz --- mapnik-vector-tile_0.9.0+dfsg.orig.tar.gz.delta | Bin 0 -> 651047 bytes mapnik-vector-tile_0.9.0+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/mapnik-vector-tile_0.9.0+dfsg.orig.tar.gz.delta b/mapnik-vector-tile_0.9.0+dfsg.orig.tar.gz.delta new file mode 100644 index 000..a33060f Binary files /dev/null and b/mapnik-vector-tile_0.9.0+dfsg.orig.tar.gz.delta differ diff --git a/mapnik-vector-tile_0.9.0+dfsg.orig.tar.gz.id b/mapnik-vector-tile_0.9.0+dfsg.orig.tar.gz.id new file mode 100644 index 000..d0485b6 --- /dev/null +++ b/mapnik-vector-tile_0.9.0+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +f29ffb9cb48a165997029b82a0d8b99d46490460 -- 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
[mapnik-vector-tile] 10/10: pristine-tar data for mapnik-vector-tile_0.10.0+dfsg.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository mapnik-vector-tile. commit 9fdccc1dee93b8380f3e556a3e02ed066807eeb9 Author: Bas Couwenberg Date: Fri Sep 11 22:56:35 2015 +0200 pristine-tar data for mapnik-vector-tile_0.10.0+dfsg.orig.tar.gz --- mapnik-vector-tile_0.10.0+dfsg.orig.tar.gz.delta | Bin 0 -> 999244 bytes mapnik-vector-tile_0.10.0+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/mapnik-vector-tile_0.10.0+dfsg.orig.tar.gz.delta b/mapnik-vector-tile_0.10.0+dfsg.orig.tar.gz.delta new file mode 100644 index 000..a04a86d Binary files /dev/null and b/mapnik-vector-tile_0.10.0+dfsg.orig.tar.gz.delta differ diff --git a/mapnik-vector-tile_0.10.0+dfsg.orig.tar.gz.id b/mapnik-vector-tile_0.10.0+dfsg.orig.tar.gz.id new file mode 100644 index 000..8a84d07 --- /dev/null +++ b/mapnik-vector-tile_0.10.0+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +fc362691d98c65a6c6b6fcd11d9aa16c7bc2451a -- 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
[mapnik-vector-tile] 08/10: pristine-tar data for mapnik-vector-tile_0.9.2+dfsg.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository mapnik-vector-tile. commit 2908f4058e39b585150b15850b3a321012773343 Author: Bas Couwenberg Date: Fri Sep 11 22:55:50 2015 +0200 pristine-tar data for mapnik-vector-tile_0.9.2+dfsg.orig.tar.gz --- mapnik-vector-tile_0.9.2+dfsg.orig.tar.gz.delta | Bin 0 -> 1011545 bytes mapnik-vector-tile_0.9.2+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/mapnik-vector-tile_0.9.2+dfsg.orig.tar.gz.delta b/mapnik-vector-tile_0.9.2+dfsg.orig.tar.gz.delta new file mode 100644 index 000..2f28c00 Binary files /dev/null and b/mapnik-vector-tile_0.9.2+dfsg.orig.tar.gz.delta differ diff --git a/mapnik-vector-tile_0.9.2+dfsg.orig.tar.gz.id b/mapnik-vector-tile_0.9.2+dfsg.orig.tar.gz.id new file mode 100644 index 000..96ab3e1 --- /dev/null +++ b/mapnik-vector-tile_0.9.2+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +5d842044f9f8f2190238b3f2397073412b889dc5 -- 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
[mapnik-vector-tile] annotated tag upstream/0.8.3+dfsg created (now 7ece986)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.8.3+dfsg in repository mapnik-vector-tile. at 7ece986 (tag) tagging 1e0d82855e0b1ae2095ceee78600c57bf24c967c (commit) replaces upstream/0.8.2+dfsg tagged by Bas Couwenberg on Fri Sep 11 22:55:14 2015 +0200 - Log - Upstream version 0.8.3+dfsg Bas Couwenberg (1): Imported Upstream version 0.8.3+dfsg --- No new revisions were added by this update. -- 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
[mapnik-vector-tile] annotated tag upstream/0.8.4+dfsg created (now d858760)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.8.4+dfsg in repository mapnik-vector-tile. at d858760 (tag) tagging 137d9fdb40429d6803f93e86ef937f707cf97b1a (commit) replaces upstream/0.8.3+dfsg tagged by Bas Couwenberg on Fri Sep 11 22:55:19 2015 +0200 - Log - Upstream version 0.8.4+dfsg Bas Couwenberg (1): Imported Upstream version 0.8.4+dfsg --- No new revisions were added by this update. -- 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
[mapnik-vector-tile] annotated tag upstream/0.9.3+dfsg created (now 4e0b830)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.9.3+dfsg in repository mapnik-vector-tile. at 4e0b830 (tag) tagging 310997b1c8b268e108bf58514eda130505eb79a7 (commit) replaces upstream/0.9.2+dfsg tagged by Bas Couwenberg on Fri Sep 11 22:56:06 2015 +0200 - Log - Upstream version 0.9.3+dfsg Bas Couwenberg (1): Imported Upstream version 0.9.3+dfsg --- No new revisions were added by this update. -- 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
[mapnik-vector-tile] annotated tag upstream/0.9.1+dfsg created (now f25952d)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.9.1+dfsg in repository mapnik-vector-tile. at f25952d (tag) tagging 7208ca5315b5effd700a34467bea4ce329f1 (commit) replaces upstream/0.9.0+dfsg tagged by Bas Couwenberg on Fri Sep 11 22:55:34 2015 +0200 - Log - Upstream version 0.9.1+dfsg Bas Couwenberg (1): Imported Upstream version 0.9.1+dfsg --- No new revisions were added by this update. -- 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
[mapnik-vector-tile] annotated tag upstream/0.10.0+dfsg created (now cc9bf8f)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.10.0+dfsg in repository mapnik-vector-tile. at cc9bf8f (tag) tagging ec8da7160e817050d279e0c7ee57c49e59ec3bf2 (commit) replaces upstream/0.9.3+dfsg tagged by Bas Couwenberg on Fri Sep 11 22:56:35 2015 +0200 - Log - Upstream version 0.10.0+dfsg Bas Couwenberg (1): Imported Upstream version 0.10.0+dfsg --- No new revisions were added by this update. -- 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
[mapnik-vector-tile] annotated tag upstream/0.8.1+dfsg created (now c9174b2)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.8.1+dfsg in repository mapnik-vector-tile. at c9174b2 (tag) tagging 49f807b4efdb6975697456d92e0a30be2ee7e1bf (commit) replaces upstream/0.8.0+dfsg tagged by Bas Couwenberg on Fri Sep 11 22:55:03 2015 +0200 - Log - Upstream version 0.8.1+dfsg Bas Couwenberg (1): Imported Upstream version 0.8.1+dfsg --- No new revisions were added by this update. -- 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
[mapnik-vector-tile] annotated tag upstream/0.9.2+dfsg created (now fe4aeb4)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.9.2+dfsg in repository mapnik-vector-tile. at fe4aeb4 (tag) tagging 9b742160076f0f9a097f81b891d4d3a2f8195b63 (commit) replaces upstream/0.9.1+dfsg tagged by Bas Couwenberg on Fri Sep 11 22:55:50 2015 +0200 - Log - Upstream version 0.9.2+dfsg Bas Couwenberg (1): Imported Upstream version 0.9.2+dfsg --- No new revisions were added by this update. -- 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
[mapnik-vector-tile] annotated tag upstream/0.8.5+dfsg created (now d62e5c1)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.8.5+dfsg in repository mapnik-vector-tile. at d62e5c1 (tag) tagging 3fa1df4173cca95bc92383252ca1ad25fd63c412 (commit) replaces upstream/0.8.4+dfsg tagged by Bas Couwenberg on Fri Sep 11 22:55:24 2015 +0200 - Log - Upstream version 0.8.5+dfsg Bas Couwenberg (1): Imported Upstream version 0.8.5+dfsg --- No new revisions were added by this update. -- 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
[mapnik-vector-tile] annotated tag upstream/0.9.0+dfsg created (now 4ac211b)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.9.0+dfsg in repository mapnik-vector-tile. at 4ac211b (tag) tagging ae7ec37b708c67bc57061794c79f1a0ddfb1fc37 (commit) replaces upstream/0.8.5+dfsg tagged by Bas Couwenberg on Fri Sep 11 22:55:29 2015 +0200 - Log - Upstream version 0.9.0+dfsg Bas Couwenberg (1): Imported Upstream version 0.9.0+dfsg --- No new revisions were added by this update. -- 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
[mapnik-vector-tile] annotated tag upstream/0.8.2+dfsg created (now e00cab3)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.8.2+dfsg in repository mapnik-vector-tile. at e00cab3 (tag) tagging ac61df0d6736fe061ef2619028b2333f5603e342 (commit) replaces upstream/0.8.1+dfsg tagged by Bas Couwenberg on Fri Sep 11 22:55:08 2015 +0200 - Log - Upstream version 0.8.2+dfsg Bas Couwenberg (1): Imported Upstream version 0.8.2+dfsg --- No new revisions were added by this update. -- 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
Bug#789942: mapnik-vector-tile: FTBFS with mapnik 3.0(?): mapnik/graphics.hpp: No such file or directory
On 17-07-15 00:56, Sebastiaan Couwenberg wrote: > mapnik-vector-tile (0.8.0+dfsg-1) fails to build with mapnik > (3.0.0+ds-2) as well. It's missing clipper.hpp: > > [...] > > This appear to be provided by an external dependency, that was added to > the Makefile in v0.8.1. That release also adds a dependency on a MapBox > specific pbf.hpp, so there are two missing build dependencies for > mapnik-vector-tile: > > 1. https://github.com/mapnik/clipper > 2. https://github.com/mapbox/pbf.hpp > > These build dependencies will need to be packaged before > mapnik-vector-tile can be fixed. The mapbox/pbf.hpp dependency is no longer required, mapnik-vector-tile has switched to the protozero [0] library also required for recent libosmium releases. mapnik/clipper is still required, this is a mapnik specific fork of polyclipping [1] (packaged in Debian as libpolyclipping [2]). I've updated the mapnik-vector-tile package to the recent 0.10.0 upstream release and patched it to use the protozero Debian package instead of a clone of the protozero git repository. I'll do the same for mapnik-clipper once that's packaged (I'm working on that too). [0] https://tracker.debian.org/pkg/protozero [1] http://sourceforge.net/projects/polyclipping/ [2] https://tracker.debian.org/pkg/libpolyclipping Kind Regards, Bas -- GPG Key ID: 4096R/6750F10AE88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[package_template] 01/02: Enable parallel builds.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository package_template. commit 2e9865219cc4aa390e9b4375378a8806209c7940 Author: Bas Couwenberg Date: Sat Sep 12 13:37:35 2015 +0200 Enable parallel builds. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 58ec00b..0788460 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,7 @@ # a similar manner are welcome. %: - dh $@ + dh $@ --parallel #get-orig-source: # . debian/get-orig-source -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/package_template.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
[package_template] branch master updated (0c845f3 -> 6372e4a)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository package_template. from 0c845f3 Add gbp.conf. new 2e98652 Enable parallel builds. new 6372e4a Update Vcs-Browser URL to use HTTPS. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/control | 2 +- debian/rules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/package_template.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
[package_template] 02/02: Update Vcs-Browser URL to use HTTPS.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository package_template. commit 6372e4a0edbed6c4b8298fa5b3cc7ca153ce8d45 Author: Bas Couwenberg Date: Sat Sep 12 13:38:12 2015 +0200 Update Vcs-Browser URL to use HTTPS. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index bf15171..f8ec2b2 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Section: science Priority: optional Build-Depends: debhelper (>= 9) Standards-Version: 3.9.6 -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/#PACKAGE#.git/ +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/#PACKAGE#.git/ Vcs-Git: git://anonscm.debian.org/pkg-grass/#PACKAGE#.git Homepage: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/package_template.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
[mapnik-vector-tile] branch master updated (4314e7e -> 5c9ec92)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository mapnik-vector-tile. from 4314e7e Use protobuf Debian package. new 9337b02 Fix protobuf/protozero confusion. new 5c9ec92 Update Vcs-Browser URL to use HTTPS. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 3 ++- debian/control | 2 +- debian/patches/use-protozero-package.patch | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) -- 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
[mapnik-vector-tile] 01/02: Fix protobuf/protozero confusion.
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 9337b02163a4755b812d134ed31d06312c89dfdd Author: Bas Couwenberg Date: Sat Sep 12 13:14:37 2015 +0200 Fix protobuf/protozero confusion. --- debian/changelog | 2 +- debian/patches/use-protozero-package.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 13fe8f7..dc5cf94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,7 +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. + * Use protozero Debian package. -- Bas Couwenberg Fri, 11 Sep 2015 23:04:17 +0200 diff --git a/debian/patches/use-protozero-package.patch b/debian/patches/use-protozero-package.patch index 54e3b4e..6912486 100644 --- a/debian/patches/use-protozero-package.patch +++ b/debian/patches/use-protozero-package.patch @@ -1,4 +1,4 @@ -Description: Use protobuf Debian package. +Description: Use protozero Debian package. Author: Bas Couwenberg Forwarded: not-needed -- 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
[mapnik-vector-tile] 02/02: Update Vcs-Browser URL to use HTTPS.
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 5c9ec92f0c64c8cd8fa57d0f245eb276bb53ac8f Author: Bas Couwenberg Date: Sat Sep 12 14:55:17 2015 +0200 Update Vcs-Browser URL to use HTTPS. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index dc5cf94..ee7c7da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ mapnik-vector-tile (0.10.0+dfsg-1) UNRELEASED; urgency=medium * Update Vcs-Browser URL to use cgit instead of gitweb. * Restructure control file with cme. * Use protozero Debian package. + * Update Vcs-Browser URL to use HTTPS. -- Bas Couwenberg Fri, 11 Sep 2015 23:04:17 +0200 diff --git a/debian/control b/debian/control index 69add72..d9e10cc 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 9), python, python-gdal Standards-Version: 3.9.6 -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/mapnik-vector-tile.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/mapnik-vector-tile.git Vcs-Git: git://anonscm.debian.org/pkg-grass/mapnik-vector-tile.git Homepage: https://github.com/mapbox/mapnik-vector-tile -- 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
[mapnik-clipper] branch master created (now 6b3fa0f)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository mapnik-clipper. at 6b3fa0f Initial Debian packaging. This branch includes the following new commits: new 2923135 Imported Upstream version 0.0~20150707-33c9329+ds new 6b3fa0f Initial Debian packaging. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik-clipper.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
[mapnik-clipper] branch pristine-tar created (now f15d694)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository mapnik-clipper. at f15d694 pristine-tar data for mapnik-clipper_0.0~20150707-33c9329+ds.orig.tar.gz This branch includes the following new commits: new f15d694 pristine-tar data for mapnik-clipper_0.0~20150707-33c9329+ds.orig.tar.gz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik-clipper.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
[mapnik-clipper] branch upstream created (now 2923135)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository mapnik-clipper. at 2923135 Imported Upstream version 0.0~20150707-33c9329+ds This branch includes the following new commits: new 2923135 Imported Upstream version 0.0~20150707-33c9329+ds The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik-clipper.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
[mapnik-clipper] 02/02: Initial Debian packaging.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mapnik-clipper. commit 6b3fa0f2413add84ae01bebebac4e3dd28a3be19 Author: Bas Couwenberg Date: Sat Sep 12 14:04:38 2015 +0200 Initial Debian packaging. --- debian/changelog | 5 debian/compat| 1 + debian/control | 21 + debian/copyright | 61 debian/gbp.conf | 16 + debian/get-orig-source | 51 debian/install | 2 ++ debian/rules | 21 + debian/source/format | 1 + debian/upstream/metadata | 6 + debian/watch | 8 +++ 11 files changed, 193 insertions(+) diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 000..f9996c3 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +mapnik-clipper (0.0~20150707-33c9329+ds-1) UNRELEASED; urgency=medium + + * Initial release (Closes: #nn) + + -- Bas Couwenberg Fri, 11 Sep 2015 23:50:44 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 000..a31adc1 --- /dev/null +++ b/debian/control @@ -0,0 +1,21 @@ +Source: mapnik-clipper +Maintainer: Debian GIS Project +Uploaders: Bas Couwenberg +Section: science +Priority: optional +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.6 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/mapnik-clipper.git/ +Vcs-Git: git://anonscm.debian.org/pkg-grass/mapnik-clipper.git +Homepage: https://github.com/mapnik/clipper + +Package: libmapnik-clipper-dev +Architecture: all +Section: libdevel +Depends: ${misc:Depends} +Description: Mapnik clipper library + The Mapnik clipper library performs clipping and offsetting for Mapnik + geometries. + . + Mapnik is a C++/Python toolkit for developing GIS applications. + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 000..f039407 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,61 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Clipper +Upstream-Contact: https://github.com/mapnik/clipper/issues +Source: https://github.com/mapnik/clipper +Files-Excluded: cpp/*/*.exe + C*/*/*/bin/*/*.dll + C*/*/*/bin/*/*.exe + Delphi/*/*.exe + Documentation/clipper.chm + +Files: * +Copyright: 2010-2015, Angus Johnson +License: BSL-1.0 + +Files: debian/* +Copyright: 2015, Bas Couwenberg +License: GPL-2+ + +License: BSL-1.0 + Boost Software License - Version 1.0 - August 17th, 2003 + . + Permission is hereby granted, free of charge, to any person or organization + obtaining a copy of the software and accompanying documentation covered by + this license (the "Software") to use, reproduce, display, distribute, + execute, and transmit the Software, and to prepare derivative works of the + Software, and to permit third-parties to whom the Software is furnished to + do so, all subject to the following: + . + The copyright notices in the Software and this entire statement, including + the above license grant, this restriction and the following disclaimer, + must be included in all copies of the Software, in whole or in part, and + all derivative works of the Software, unless such copies or derivative + works are solely in the form of machine-executable object code generated by + a source language processor. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + . + On Debian systems, the complete text of version 2 of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-2'. + diff --git a/debian/gbp.conf b/
[mapnik-clipper] 01/01: pristine-tar data for mapnik-clipper_0.0~20150707-33c9329+ds.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository mapnik-clipper. commit f15d6945f8f386f76615598bd330ff50e4d4513e Author: Bas Couwenberg Date: Sat Sep 12 14:03:54 2015 +0200 pristine-tar data for mapnik-clipper_0.0~20150707-33c9329+ds.orig.tar.gz --- mapnik-clipper_0.0~20150707-33c9329+ds.orig.tar.gz.delta | Bin 0 -> 3390 bytes mapnik-clipper_0.0~20150707-33c9329+ds.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/mapnik-clipper_0.0~20150707-33c9329+ds.orig.tar.gz.delta b/mapnik-clipper_0.0~20150707-33c9329+ds.orig.tar.gz.delta new file mode 100644 index 000..9813b3e Binary files /dev/null and b/mapnik-clipper_0.0~20150707-33c9329+ds.orig.tar.gz.delta differ diff --git a/mapnik-clipper_0.0~20150707-33c9329+ds.orig.tar.gz.id b/mapnik-clipper_0.0~20150707-33c9329+ds.orig.tar.gz.id new file mode 100644 index 000..82cc8c6 --- /dev/null +++ b/mapnik-clipper_0.0~20150707-33c9329+ds.orig.tar.gz.id @@ -0,0 +1 @@ +91ff09b7a0240e357df962334101aa196142e286 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik-clipper.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
[mapnik-clipper] annotated tag upstream/0.0_20150707-33c9329+ds created (now 9b817f8)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/0.0_20150707-33c9329+ds in repository mapnik-clipper. at 9b817f8 (tag) tagging 2923135d2d21ffb6c18be38cd93c7afaa3481fe2 (commit) tagged by Bas Couwenberg on Sat Sep 12 14:03:54 2015 +0200 - Log - Upstream version 0.0~20150707-33c9329+ds Bas Couwenberg (1): Imported Upstream version 0.0~20150707-33c9329+ds --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik-clipper.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
proj 4.9.1-3 MIGRATED to testing
FYI: The status of the proj source package in Debian's testing distribution has changed. Previous version: 4.9.1-2 Current version: 4.9.1-3 -- This email is automatically generated once a day. As the installation of new packages into testing happens multiple times a day you will receive later changes on the next day. See https://release.debian.org/testing-watch/ for more information. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapnik-vector-tile] 04/05: Don't install mapnik3x_compatibility.hpp, no longer included upstream.
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 e3c0bacbab8319c47ce207c94a4528e74f7d4dba Author: Bas Couwenberg Date: Sat Sep 12 21:09:47 2015 +0200 Don't install mapnik3x_compatibility.hpp, no longer included upstream. Include all .cpp & .ipp files as examples. --- debian/changelog | 2 ++ debian/examples | 2 ++ debian/install | 3 +-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7bdd931..478384c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ mapnik-vector-tile (0.10.0+dfsg-1) UNRELEASED; urgency=medium * Update Vcs-Browser URL to use HTTPS. * Use mapnik-clipper Debian package. * Ignore test failures to not fail the entire build. + * Don't install mapnik3x_compatibilty.hpp, no longer included upstream. + * Include all .cpp & .ipp files as examples. -- Bas Couwenberg Fri, 11 Sep 2015 23:04:17 +0200 diff --git a/debian/examples b/debian/examples new file mode 100644 index 000..e9309aa --- /dev/null +++ b/debian/examples @@ -0,0 +1,2 @@ +src/*.cpp +src/*.ipp diff --git a/debian/install b/debian/install index df8f708..e35b5a8 100644 --- a/debian/install +++ b/debian/install @@ -1,2 +1 @@ -src/vector_tile* usr/include -src/mapnik3x_compatibility.hpp usr/include +src/*.hpp usr/include -- 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
[mapnik-vector-tile] 05/05: Enable parallel builds.
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 34c4c40ea1eeabbce5f983d1549428f534ef70ae Author: Bas Couwenberg Date: Sat Sep 12 21:34:08 2015 +0200 Enable parallel builds. --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 478384c..6c6a12f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ mapnik-vector-tile (0.10.0+dfsg-1) UNRELEASED; urgency=medium * Ignore test failures to not fail the entire build. * Don't install mapnik3x_compatibilty.hpp, no longer included upstream. * Include all .cpp & .ipp files as examples. + * Enable parallel builds. -- Bas Couwenberg Fri, 11 Sep 2015 23:04:17 +0200 diff --git a/debian/rules b/debian/rules index 12d9e3a..e172128 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ #export DH_VERBOSE=1 %: - dh $@ + dh $@ --parallel override_dh_auto_clean: rm -f deps/gyp/gyp -- 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
[mapnik-vector-tile] 02/05: Ignore test failures to not fail the entire build.
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 66646808af17c7eed8c3a0121a9bdcdb3b4cf3e2 Author: Bas Couwenberg Date: Sat Sep 12 19:33:06 2015 +0200 Ignore test failures to not fail the entire build. --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 130363a..7bdd931 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ mapnik-vector-tile (0.10.0+dfsg-1) UNRELEASED; urgency=medium * Use protozero Debian package. * Update Vcs-Browser URL to use HTTPS. * Use mapnik-clipper Debian package. + * Ignore test failures to not fail the entire build. -- Bas Couwenberg Fri, 11 Sep 2015 23:04:17 +0200 diff --git a/debian/rules b/debian/rules index 8431937..8084b4d 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ override_dh_auto_test: ln -s /usr/include/catch.hpp test/ python debian/create-raster.py - dh_auto_test + dh_auto_test || echo "Ignoring test failures" override_dh_auto_build: -mkdir -p deps/gyp -- 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
[mapnik-vector-tile] 01/05: Use mapnik-clipper Debian package.
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 4bf2d78d32bfee454723aaf0d05b97911faee5fe Author: Bas Couwenberg Date: Sat Sep 12 18:38:50 2015 +0200 Use mapnik-clipper Debian package. --- debian/changelog | 1 + debian/control | 1 + debian/rules | 6 ++ 3 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index ee7c7da..130363a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ mapnik-vector-tile (0.10.0+dfsg-1) UNRELEASED; urgency=medium * Restructure control file with cme. * Use protozero Debian package. * Update Vcs-Browser URL to use HTTPS. + * Use mapnik-clipper Debian package. -- Bas Couwenberg Fri, 11 Sep 2015 23:04:17 +0200 diff --git a/debian/control b/debian/control index d9e10cc..e3968b1 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 9), libprotobuf-dev, libprotozero-dev, catch, + libmapnik-clipper-dev, libmapnik-dev (>= 3.0.0~), python, python-gdal diff --git a/debian/rules b/debian/rules index fac31f8..8431937 100755 --- a/debian/rules +++ b/debian/rules @@ -15,11 +15,17 @@ override_dh_auto_test: override_dh_auto_build: -mkdir -p deps/gyp -ln -s /usr/bin/gyp deps/gyp/gyp + -mkdir -p deps/clipper/cpp + -ln -s /usr/src/mapnik-clipper/clipper.cpp deps/clipper/cpp/clipper.cpp + -ln -s /usr/include/mapnik-clipper/clipper.hpp deps/clipper/cpp/clipper.hpp dh_auto_build override_dh_auto_clean: rm -f deps/gyp/gyp -rmdir deps/gyp + rm -f deps/clipper/cpp/* + -rmdir deps/clipper/cpp + -rmdir deps/clipper -rmdir deps rm -rf build dh_clean -- 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
[mapnik-vector-tile] branch master updated (5c9ec92 -> 34c4c40)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository mapnik-vector-tile. from 5c9ec92 Update Vcs-Browser URL to use HTTPS. new 4bf2d78 Use mapnik-clipper Debian package. new 6664680 Ignore test failures to not fail the entire build. new fa84382 Reorder rules in order of execution. new e3c0bac Don't install mapnik3x_compatibility.hpp, no longer included upstream. new 34c4c40 Enable parallel builds. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 5 + debian/control | 1 + debian/examples | 2 ++ debian/install | 3 +-- debian/rules | 29 ++--- 5 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 debian/examples -- 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
[mapnik-vector-tile] 03/05: Reorder rules in order of execution.
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 fa84382dd9709a77e7f1830393956580aeacbe6d Author: Bas Couwenberg Date: Sat Sep 12 20:46:01 2015 +0200 Reorder rules in order of execution. --- debian/rules | 27 ++- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/debian/rules b/debian/rules index 8084b4d..12d9e3a 100755 --- a/debian/rules +++ b/debian/rules @@ -7,10 +7,15 @@ %: dh $@ -override_dh_auto_test: - ln -s /usr/include/catch.hpp test/ - python debian/create-raster.py - dh_auto_test || echo "Ignoring test failures" +override_dh_auto_clean: + rm -f deps/gyp/gyp + -rmdir deps/gyp + rm -f deps/clipper/cpp/* + -rmdir deps/clipper/cpp + -rmdir deps/clipper + -rmdir deps + rm -rf build + dh_auto_clean override_dh_auto_build: -mkdir -p deps/gyp @@ -20,12 +25,8 @@ override_dh_auto_build: -ln -s /usr/include/mapnik-clipper/clipper.hpp deps/clipper/cpp/clipper.hpp dh_auto_build -override_dh_auto_clean: - rm -f deps/gyp/gyp - -rmdir deps/gyp - rm -f deps/clipper/cpp/* - -rmdir deps/clipper/cpp - -rmdir deps/clipper - -rmdir deps - rm -rf build - dh_clean +override_dh_auto_test: + ln -s /usr/include/catch.hpp test/ + python debian/create-raster.py + dh_auto_test || echo "Ignoring test failures" + -- 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
Bug#789942: mapnik-vector-tile: FTBFS with mapnik 3.0(?): mapnik/graphics.hpp: No such file or directory
Hi Jérémy & David, Please share your thoughts about the future of the mapnik-vector-tile, and its reverse dependencies (node-mapnik & node-tilelive-{bridge,mapnik,vector}). On 12-09-15 13:10, Sebastiaan Couwenberg wrote: > The mapbox/pbf.hpp dependency is no longer required, mapnik-vector-tile > has switched to the protozero [0] library also required for recent > libosmium releases. > > mapnik/clipper is still required, this is a mapnik specific fork of > polyclipping [1] (packaged in Debian as libpolyclipping [2]). > > I've updated the mapnik-vector-tile package to the recent 0.10.0 > upstream release and patched it to use the protozero Debian package > instead of a clone of the protozero git repository. I'll do the same for > mapnik-clipper once that's packaged (I'm working on that too). I've create initial Debian packaging for mapnik/clipper [0], and updated mapnik-vector-tile [1] to use that package. mapnik-vector-tile (0.10.0+dfsg-1) now builds successfully, but a test does fail. Updating the mapnik-vector-tile package to work with mapnik 3.0.x, and packaging the mapnik/clipper dependency is being discussed in the upstream issue tracker [2]. One of the upstream developers remarked that packaging mapnik-vector-tile shouldn't be required, because developers are expected to bundle mapnik-vector-tile in their projects. As noted in the issue, mapnik-vector-tile is packaged because node-mapnik requires it. And node-mapnik is in turn required for node-tilelive-{bridge,mapnik,vector}. Maybe we should consider removing mapnik-vector-tile and its reverse dependencies from the archive. What are your thoughts about this as the maintainers of these packages? [0] https://anonscm.debian.org/cgit/pkg-grass/mapnik-clipper.git [1] https://anonscm.debian.org/cgit/pkg-grass/mapnik-vector-tile.git [2] https://github.com/mapnik/clipper/issues/1 Kind Regards, Bas -- GPG Key ID: 4096R/6750F10AE88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#789942: mapnik-vector-tile: FTBFS with mapnik 3.0(?): mapnik/graphics.hpp: No such file or directory
2015-09-12 21:56 GMT+02:00 Sebastiaan Couwenberg : > Hi Jérémy & David, > > Please share your thoughts about the future of the mapnik-vector-tile, > and its reverse dependencies (node-mapnik & > node-tilelive-{bridge,mapnik,vector}). > > On 12-09-15 13:10, Sebastiaan Couwenberg wrote: > > The mapbox/pbf.hpp dependency is no longer required, mapnik-vector-tile > > has switched to the protozero [0] library also required for recent > > libosmium releases. > > > > mapnik/clipper is still required, this is a mapnik specific fork of > > polyclipping [1] (packaged in Debian as libpolyclipping [2]). > > > > I've updated the mapnik-vector-tile package to the recent 0.10.0 > > upstream release and patched it to use the protozero Debian package > > instead of a clone of the protozero git repository. I'll do the same for > > mapnik-clipper once that's packaged (I'm working on that too). > > I've create initial Debian packaging for mapnik/clipper [0], and updated > mapnik-vector-tile [1] to use that package. > > mapnik-vector-tile (0.10.0+dfsg-1) now builds successfully, but a test > does fail. > > Updating the mapnik-vector-tile package to work with mapnik 3.0.x, and > packaging the mapnik/clipper dependency is being discussed in the > upstream issue tracker [2]. > > One of the upstream developers remarked that packaging > mapnik-vector-tile shouldn't be required, because developers are > expected to bundle mapnik-vector-tile in their projects. > > As noted in the issue, mapnik-vector-tile is packaged because > node-mapnik requires it. And node-mapnik is in turn required for > node-tilelive-{bridge,mapnik,vector}. > > Maybe we should consider removing mapnik-vector-tile and its reverse > dependencies from the archive. > > What are your thoughts about this as the maintainers of these packages? > My position is that it is good to have node-mapnik in debian, because it's not that easy to install otherwise - and i'm quite motivated to update it, but i'll find time to do it before the end of the year. Jérémy ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#789942: mapnik-vector-tile: FTBFS with mapnik 3.0(?): mapnik/graphics.hpp: No such file or directory
On 12-09-15 23:04, Jérémy Lal wrote: > 2015-09-12 21:56 GMT+02:00 Sebastiaan Couwenberg : >> Please share your thoughts about the future of the mapnik-vector-tile, >> and its reverse dependencies (node-mapnik & >> node-tilelive-{bridge,mapnik,vector}). >> >> [...] > > My position is that it is good to have node-mapnik in debian, because it's > not that easy to > install otherwise - and i'm quite motivated to update it, but i'll find > time to do it before the end of the year. Alright. If we're going to keep node-mapnik around, we need to get mapnik-vector-tile (0.10.0+dfsg-1) ready for upload. Do you prefer a separate mapnik-clipper package, or just bundling clipper.{c,h}pp in mapnik-vector-tile? Kind Regards, Bas -- GPG Key ID: 4096R/6750F10AE88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapnik-vector-tile] branch master updated (34c4c40 -> b33acad)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository mapnik-vector-tile. from 34c4c40 Enable parallel builds. new 97158d2 Include clipper.{c,h}pp copies to not require a separate package. new 22899b8 Close bug in changelog. new f342763 Install upstream examples too. new a0f5ad7 Include vector_tile.proto in examples too. new b33acad Set distribution to unstable. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/README.source | 13 + debian/changelog |9 +- debian/clipper.cpp | 4577 ++ debian/clipper.hpp | 435 + debian/control |1 - debian/copyright | 29 + debian/examples |2 + debian/rules |8 +- debian/update-clipper.sh | 18 + 9 files changed, 5086 insertions(+), 6 deletions(-) create mode 100644 debian/README.source create mode 100644 debian/clipper.cpp create mode 100644 debian/clipper.hpp create mode 100644 debian/update-clipper.sh -- 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
[mapnik-vector-tile] tag debian/0.10.0+dfsg-1 created (now b33acad)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/0.10.0+dfsg-1 in repository mapnik-vector-tile. at b33acad (commit) No new revisions were added by this update. -- 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
[mapnik-vector-tile] 02/05: Close bug in changelog.
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 22899b86260f8201a0bb75b7a0a79bb4106be513 Author: Bas Couwenberg Date: Sun Sep 13 00:27:07 2015 +0200 Close bug in changelog. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7d2d395..73be065 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ mapnik-vector-tile (0.10.0+dfsg-1) UNRELEASED; urgency=medium * Imported Upstream version 0.8.0+dfsg * Build-Depends gyp * Fixed watch file + * Depends and Build-Depends libmapnik-dev 3.0.0~. +(closes: #789942) [ Bas Couwenberg ] * Imported upstream version 0.10.0+dfsg. -- 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
[mapnik-vector-tile] 03/05: Install upstream examples too.
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 f34276309923baf07b2f8fbe6bbca31b4174f377 Author: Bas Couwenberg Date: Sun Sep 13 00:31:33 2015 +0200 Install upstream examples too. --- debian/changelog | 1 + debian/examples | 1 + debian/rules | 4 3 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 73be065..fa1938e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ mapnik-vector-tile (0.10.0+dfsg-1) UNRELEASED; urgency=medium * Include all .cpp & .ipp files as examples. * Enable parallel builds. * Include clipper.{c,h}pp copies to not require a separate package. + * Install upstream examples too. -- Bas Couwenberg Fri, 11 Sep 2015 23:04:17 +0200 diff --git a/debian/examples b/debian/examples index e9309aa..1b069b3 100644 --- a/debian/examples +++ b/debian/examples @@ -1,2 +1,3 @@ src/*.cpp src/*.ipp +examples/* diff --git a/debian/rules b/debian/rules index a9aa8ed..fc8f80e 100755 --- a/debian/rules +++ b/debian/rules @@ -30,3 +30,7 @@ override_dh_auto_test: python debian/create-raster.py dh_auto_test || echo "Ignoring test failures" +override_dh_installexamples: + dh_installexamples + chmod 644 debian/*/usr/share/doc/*/examples/*/Makefile + -- 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
[mapnik-vector-tile] 05/05: Set distribution to unstable.
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 b33acad6b996a3d5bac8bbcde11c0f8e9b9c7655 Author: Bas Couwenberg Date: Sun Sep 13 00:35:41 2015 +0200 Set distribution to unstable. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fa1938e..7b8299f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mapnik-vector-tile (0.10.0+dfsg-1) UNRELEASED; urgency=medium +mapnik-vector-tile (0.10.0+dfsg-1) unstable; urgency=medium * Team upload. @@ -27,7 +27,7 @@ mapnik-vector-tile (0.10.0+dfsg-1) UNRELEASED; urgency=medium * Include clipper.{c,h}pp copies to not require a separate package. * Install upstream examples too. - -- Bas Couwenberg Fri, 11 Sep 2015 23:04:17 +0200 + -- Bas Couwenberg Sun, 13 Sep 2015 00:35:31 +0200 mapnik-vector-tile (0.5.1+dfsg-2) unstable; urgency=medium -- 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
[mapnik-vector-tile] 04/05: Include vector_tile.proto in examples too.
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 a0f5ad76771648e596be6e1e2b62fd565125a238 Author: Bas Couwenberg Date: Sun Sep 13 00:34:02 2015 +0200 Include vector_tile.proto in examples too. --- debian/examples | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/examples b/debian/examples index 1b069b3..3bba3bc 100644 --- a/debian/examples +++ b/debian/examples @@ -1,3 +1,4 @@ +examples/* +proto/ src/*.cpp src/*.ipp -examples/* -- 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
Processing of mapnik-vector-tile_0.10.0+dfsg-1_amd64.changes
mapnik-vector-tile_0.10.0+dfsg-1_amd64.changes uploaded successfully to localhost along with the files: mapnik-vector-tile_0.10.0+dfsg-1.dsc mapnik-vector-tile_0.10.0+dfsg.orig.tar.gz mapnik-vector-tile_0.10.0+dfsg-1.debian.tar.xz mapnik-vector-tile_0.10.0+dfsg-1_all.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
mapnik-vector-tile_0.10.0+dfsg-1_amd64.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Sun, 13 Sep 2015 00:35:31 +0200 Source: mapnik-vector-tile Binary: mapnik-vector-tile Architecture: source all Version: 0.10.0+dfsg-1 Distribution: unstable Urgency: medium Maintainer: Debian GIS Project Changed-By: Bas Couwenberg Description: mapnik-vector-tile - Vector tiles integration with mapnik - development files Closes: 789942 Changes: mapnik-vector-tile (0.10.0+dfsg-1) unstable; urgency=medium . * Team upload. . [ Jérémy Lal ] * Imported Upstream version 0.8.0+dfsg * Build-Depends gyp * Fixed watch file * Depends and Build-Depends libmapnik-dev 3.0.0~. (closes: #789942) . [ Bas Couwenberg ] * Imported upstream version 0.10.0+dfsg. * Add gbp.conf to use pristine-tar by default. * Update watch file, changes: - Handle common versionmangle issues - Support other tarball extensions - Use repacksuffix option for appending +dfsg * Update Vcs-Browser URL to use cgit instead of gitweb. * Restructure control file with cme. * Use protozero Debian package. * Update Vcs-Browser URL to use HTTPS. * Ignore test failures to not fail the entire build. * Don't install mapnik3x_compatibilty.hpp, no longer included upstream. * Include all .cpp & .ipp files as examples. * Enable parallel builds. * Include clipper.{c,h}pp copies to not require a separate package. * Install upstream examples too. Checksums-Sha1: b38a527a9f8eca740ad5fb1799a56c8950f28064 2168 mapnik-vector-tile_0.10.0+dfsg-1.dsc 04e72a8cb7941e3e21a5d119ba2206e6ddfdebf6 1942781 mapnik-vector-tile_0.10.0+dfsg.orig.tar.gz 3bd67ecc71717d7753b7c9744a0558c86b6cb1f4 33876 mapnik-vector-tile_0.10.0+dfsg-1.debian.tar.xz ea03a12eae8eae2ae3438c9de74591e2dbba6b94 720480 mapnik-vector-tile_0.10.0+dfsg-1_all.deb Checksums-Sha256: 9f6884250701f9794dcd7d778fb5b7b56a92d2e96ff3c302f736a01d9950ab31 2168 mapnik-vector-tile_0.10.0+dfsg-1.dsc 0a0b79f3e82a194911fe92017138142c18b15b77a474d3fedcc5296038b654d5 1942781 mapnik-vector-tile_0.10.0+dfsg.orig.tar.gz fe12d4bfd830ec72836f6968be9125a6645f2881da3c10acfc272b569de66b17 33876 mapnik-vector-tile_0.10.0+dfsg-1.debian.tar.xz 67e0cd55b54ce2af8552d5e3cb03588528a7bea349de3e2dcc662a88c4959912 720480 mapnik-vector-tile_0.10.0+dfsg-1_all.deb Files: f9f92d62a59b54a090619ffe1289d036 2168 devel extra mapnik-vector-tile_0.10.0+dfsg-1.dsc 274965a761c16f860c13e5dcd354c56e 1942781 devel extra mapnik-vector-tile_0.10.0+dfsg.orig.tar.gz 1dd3872e44c0ba3729f8f26406c7c09e 33876 devel extra mapnik-vector-tile_0.10.0+dfsg-1.debian.tar.xz 0425df98e5b7b2334ea91a5d5acbbeb7 720480 devel extra mapnik-vector-tile_0.10.0+dfsg-1_all.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJV9LTlAAoJEGdQ8QrojUrxhcYP/1nWl5zw96ota9qbQDWco+kQ zb8zdvJh+vz1b2GQIoBAxPOJYkDlcFrU5QLNl/Pfg6DNfTXzk/h1BJ9lnE7hAqRL jZ7sDTeANT/kFz1qeKqDL3ExljbkrqiI2zzcr++q/ses4BHkkq0n1tfwDkIgxKWj 66tasBnroDZlPdr6pEx4qxbCxXGgg5XuxYmUI+C8Se1b8p2DHMUAbzEHxCx28W2+ H9oa7towxzbDMJuJ6TgULqO8gCnPSwjV2A/e+utESr0tWIfK0+L6+k0os2bE7pVi LR/vTvLfv3bOxLGusAL5wJuSEH/jM8ZTTpubS0yM0IxdEr9yhG91yQFwZjewPmUU QLyOyixSLZbhj9/NMFfPuGYQbEmgyXwPHq9azJFFknM+pWuGxgWs8xgkSlDYy1I8 djqJ09QClQ9ryBUoNuj7sQe06flknRVP9WIkAbC09mz1oeXZEG9Iw0Ou5kG916Uj 6Q3uO6DAbA9RyQqVT5hQSusSowEti3bUi9SdbKa3+SRfqNy5QkVKzmql9B4ogYTK uKnZwbJpnCqy9xR7uMgrSGpVcPO5wlUW6yemF5VTpnfl6Zk1csG8dIOaC1cGv9Ot aTOxSa602xv3BcQo8Sr2Lh+VjojmWxZsZBXVQLlvGAiZVJNqphrWaMiT9s+/aksM zuNU4DIpbE68gcyoj8Qh =74Vi -END PGP SIGNATURE- Thank you for your contribution to Debian. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processed: Re: Bug#789942: mapnik-vector-tile: FTBFS with mapnik 3.0(?): mapnik/graphics.hpp: No such file or directory
Processing control commands: > tags -1 pending Bug #789942 [mapnik-vector-tile] mapnik-vector-tile: FTBFS with mapnik 3.0(?): mapnik/graphics.hpp: No such file or directory Added tag(s) pending. -- 789942: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=789942 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#789942: mapnik-vector-tile: FTBFS with mapnik 3.0(?): mapnik/graphics.hpp: No such file or directory
Control: tags -1 pending Hi Jérémy, On 12-09-15 23:14, Sebastiaan Couwenberg wrote: > On 12-09-15 23:04, Jérémy Lal wrote: >> My position is that it is good to have node-mapnik in debian, because it's >> not that easy to >> install otherwise - and i'm quite motivated to update it, but i'll find >> time to do it before the end of the year. > > Alright. If we're going to keep node-mapnik around, we need to get > mapnik-vector-tile (0.10.0+dfsg-1) ready for upload. > > Do you prefer a separate mapnik-clipper package, or just bundling > clipper.{c,h}pp in mapnik-vector-tile? I've opted to bundle clipper.{c,h}pp in mapnik-vector-tile for the time being, we can still decide to switch to the mapnik-clipper package after all. mapnik-vector-tile (0.10.0+dfsg-1) has been uploaded to unstable to fix this RC issue, and to remove this blocker for the node-mapnik update as part of the upcoming nodejs 4.0 migrations. Kind Regards, Bas -- GPG Key ID: 4096R/6750F10AE88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#789942: marked as done (mapnik-vector-tile: FTBFS with mapnik 3.0(?): mapnik/graphics.hpp: No such file or directory)
Your message dated Sat, 12 Sep 2015 23:34:14 + with message-id and subject line Bug#789942: fixed in mapnik-vector-tile 0.10.0+dfsg-1 has caused the Debian Bug report #789942, regarding mapnik-vector-tile: FTBFS with mapnik 3.0(?): mapnik/graphics.hpp: No such file or directory to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 789942: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=789942 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems --- Begin Message --- Package: mapnik-vector-tile Version: 0.5.1+dfsg-1.3 Severity: serious Tags: sid stretch Justification: fails to build from source (but built successfully in the past) User: reproducible-bui...@lists.alioth.debian.org Usertags: ftbfs Dear Maintainer, The package fails to build in sid: ake[2]: Entering directory '/mapnik-vector-tile-0.5.1+dfsg' echo "#define MAPNIK_PLUGINDIR \"/usr/lib/mapnik/3.0/input\"" > test/test-cfg.h In file included from test/vector_tile.cpp:6:0: test/test_utils.hpp:6:31: fatal error: mapnik/graphics.hpp: No such file or directory #include ^ compilation terminated. I believe this is due to libmapnik-dev pulling in mapnik 3.0. See also e.g. http://bugs.debian.org/788767 Full build log: https://reproducible.debian.net/rb-pkg/unstable/amd64/mapnik-vector-tile.html -- System Information: Debian Release: stretch/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 3.19.0-21-generic (SMP w/8 CPU cores) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) --- End Message --- --- Begin Message --- Source: mapnik-vector-tile Source-Version: 0.10.0+dfsg-1 We believe that the bug you reported is fixed in the latest version of mapnik-vector-tile, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to 789...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Bas Couwenberg (supplier of updated mapnik-vector-tile package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing ftpmas...@ftp-master.debian.org) -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Sun, 13 Sep 2015 00:35:31 +0200 Source: mapnik-vector-tile Binary: mapnik-vector-tile Architecture: source all Version: 0.10.0+dfsg-1 Distribution: unstable Urgency: medium Maintainer: Debian GIS Project Changed-By: Bas Couwenberg Description: mapnik-vector-tile - Vector tiles integration with mapnik - development files Closes: 789942 Changes: mapnik-vector-tile (0.10.0+dfsg-1) unstable; urgency=medium . * Team upload. . [ Jérémy Lal ] * Imported Upstream version 0.8.0+dfsg * Build-Depends gyp * Fixed watch file * Depends and Build-Depends libmapnik-dev 3.0.0~. (closes: #789942) . [ Bas Couwenberg ] * Imported upstream version 0.10.0+dfsg. * Add gbp.conf to use pristine-tar by default. * Update watch file, changes: - Handle common versionmangle issues - Support other tarball extensions - Use repacksuffix option for appending +dfsg * Update Vcs-Browser URL to use cgit instead of gitweb. * Restructure control file with cme. * Use protozero Debian package. * Update Vcs-Browser URL to use HTTPS. * Ignore test failures to not fail the entire build. * Don't install mapnik3x_compatibilty.hpp, no longer included upstream. * Include all .cpp & .ipp files as examples. * Enable parallel builds. * Include clipper.{c,h}pp copies to not require a separate package. * Install upstream examples too. Checksums-Sha1: b38a527a9f8eca740ad5fb1799a56c8950f28064 2168 mapnik-vector-tile_0.10.0+dfsg-1.dsc 04e72a8cb7941e3e21a5d119ba2206e6ddfdebf6 1942781 mapnik-vector-tile_0.10.0+dfsg.orig.tar.gz 3bd67ecc71717d7753b7c9744a0558c86b6cb1f4 33876 mapnik-vector-tile_0.10.0+dfsg-1.debian.tar.xz ea03a12eae8eae2ae3438c9de74591e2dbba6b94 720480 mapnik-vector-tile_0.10.0+dfsg-1_all.deb Checksums-Sha256: 9f6884250701f9794dcd7d778fb5b7b56a92d2e96ff3c302f736a01d9950ab31 2168 mapnik-vector-tile_0.10.0+dfsg-1.dsc 0a0b79f3e82a194911fe92017138142c18b15b77a474d3fedcc5296038b654d5 1942781 mapnik-vector-tile_0.10.0+dfsg.orig.tar.gz fe12d4bfd830ec72836f