[osrm] 12/22: Use libmapbox-variant-dev instead of embedded copy.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository osrm.

commit 8c85eb037853509a4828380537f40ffb91cbc55b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Apr 29 23:52:27 2016 +0200

    Use libmapbox-variant-dev instead of embedded copy.
---
 debian/changelog                                |  1 +
 debian/control                                  |  1 +
 debian/patches/series                           |  1 +
 debian/patches/use-mapbox-variant-package.patch | 24 ++++++++++++++++++++++++
 4 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 238933f..891bcf7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ osrm (5.0.2+ds-1) UNRELEASED; urgency=medium
   * Drop typo patches, applied upstream. Refresh remaining patches.
   * Update copyright years for Project OSRM contributors.
   * Repack upstream tarballs to exclude embedded copy of libosmium.
+  * Use libmapbox-variant-dev instead of embedded copy.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 29 Apr 2016 23:13:45 +0200
 
diff --git a/debian/control b/debian/control
index e6d02a8..bfc6e26 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,7 @@ Build-Depends: debhelper (>= 9.0.0),
                liblua5.1-0-dev,
                libluabind-dev,
                pkg-config,
+               libmapbox-variant-dev,
                libosmium2-dev,
                libgdal-dev,
                libtbb-dev,
diff --git a/debian/patches/series b/debian/patches/series
index 5545da4..cd2fc58 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 use-libosmium-package.patch
 spelling-errors.patch
+use-mapbox-variant-package.patch
diff --git a/debian/patches/use-mapbox-variant-package.patch b/debian/patches/use-mapbox-variant-package.patch
new file mode 100644
index 0000000..94a93a1
--- /dev/null
+++ b/debian/patches/use-mapbox-variant-package.patch
@@ -0,0 +1,24 @@
+Description: Use mapbox-variant Debian package.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -378,7 +378,7 @@ set_property(TARGET osrm-contract PROPER
+ set_property(TARGET osrm-datastore PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
+ set_property(TARGET osrm-routed PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
+ 
+-file(GLOB VariantGlob third_party/variant/*.hpp)
++#file(GLOB VariantGlob third_party/variant/*.hpp)
+ file(GLOB LibraryGlob include/osrm/*.hpp)
+ file(GLOB ParametersGlob include/engine/api/*_parameters.hpp)
+ set(EngineHeader include/engine/status.hpp include/engine/engine_config.hpp include/engine/hint.hpp include/engine/bearing.hpp include/engine/phantom_node.hpp)
+@@ -393,7 +393,7 @@ install(FILES ${ExtractorHeader} DESTINA
+ install(FILES ${ContractorHeader} DESTINATION include/osrm/contractor)
+ install(FILES ${LibraryGlob} DESTINATION include/osrm)
+ install(FILES ${ParametersGlob} DESTINATION include/osrm/engine/api)
+-install(FILES ${VariantGlob} DESTINATION include/variant)
++#install(FILES ${VariantGlob} DESTINATION include/variant)
+ install(TARGETS osrm-extract DESTINATION bin)
+ install(TARGETS osrm-contract DESTINATION bin)
+ install(TARGETS osrm-datastore DESTINATION bin)

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