[osrm] 08/12: Use libosmium2-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 030e434859bf6af853b5a346c21d163b0e961238
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Oct 19 22:18:29 2015 +0200

    Use libosmium2-dev instead of embedded copy.
---
 debian/changelog                           |  1 +
 debian/control                             |  1 +
 debian/patches/series                      |  1 +
 debian/patches/use-libosmium-package.patch | 16 ++++++++++++++++
 4 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 76e453a..2e6750d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ osrm (4.8.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Repack upstream tarballs to exclude embedded copy of libosmium.
+  * Use libosmium2-dev instead of embedded copy.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 19 Oct 2015 21:40:06 +0200
 
diff --git a/debian/control b/debian/control
index a10d371..ab701a8 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,7 @@ Build-Depends: debhelper (>= 9.0.0),
                libluabind-dev,
                pkg-config,
                libosmpbf-dev,
+               libosmium2-dev,
                libgdal-dev,
                libtbb-dev,
                libexpat1-dev,
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..53a4196
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use-libosmium-package.patch
diff --git a/debian/patches/use-libosmium-package.patch b/debian/patches/use-libosmium-package.patch
new file mode 100644
index 0000000..f0dc9a2
--- /dev/null
+++ b/debian/patches/use-libosmium-package.patch
@@ -0,0 +1,16 @@
+Description: Use libosmium Debian package.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,7 +33,8 @@ option(BUILD_TOOLS "Build OSRM tools" OF
+ 
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third_party/)
+-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/include/)
++# Use libosmium2-dev instead of embedded copy
++#include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/include/)
+ 
+ add_custom_target(FingerPrintConfigure ALL
+   ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_SOURCE_DIR}

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