[osrm] 05/05: Update patch to latest upstream version

[Andreas Tille]

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

tille pushed a commit to branch master
in repository osrm.

commit c0c5e58e25d428cac08909b315b4d2eee48fb27c
Author: Andreas Tille <tille at debian.org>
Date:   Thu Jul 10 16:50:20 2014 +0200

    Update patch to latest upstream version
---
 debian/patches/add-cmake-install       | 38 ----------------------------------
 debian/patches/add-cmake-install.patch | 24 +++++++++++++++++++++
 debian/patches/series                  |  2 +-
 3 files changed, 25 insertions(+), 39 deletions(-)

diff --git a/debian/patches/add-cmake-install b/debian/patches/add-cmake-install
deleted file mode 100644
index 148e34f..0000000
--- a/debian/patches/add-cmake-install
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- osrm (0.3.4-1) unstable; urgency=low
- .
-   * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
-Author: Christopher Baines <cbaines8 at gmail.com>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- osrm-0.3.4.orig/CMakeLists.txt
-+++ osrm-0.3.4/CMakeLists.txt
-@@ -107,5 +107,10 @@ if(WITH_TOOLS)
- 		include_directories(${GDAL_INCLUDE_DIR})
- 		target_link_libraries( osrm-components ${GDAL_LIBRARIES} )
- 		target_link_libraries( osrm-components ${Boost_LIBRARIES} )
-+        install(TARGETS osrm-components RUNTIME DESTINATION bin)
- 	endif(GDAL_FOUND)
- endif(WITH_TOOLS)
-+
-+install(TARGETS osrm-extract RUNTIME DESTINATION bin)
-+install(TARGETS osrm-prepare RUNTIME DESTINATION bin)
-+install(TARGETS osrm-routed RUNTIME DESTINATION bin)
diff --git a/debian/patches/add-cmake-install.patch b/debian/patches/add-cmake-install.patch
new file mode 100644
index 0000000..ee72ada
--- /dev/null
+++ b/debian/patches/add-cmake-install.patch
@@ -0,0 +1,24 @@
+Author: Christopher Baines <cbaines8 at gmail.com>
+Last-Update: Thu, 10 Jul 2014 16:44:14 +0200
+Description: Add install destination to dmake target
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -263,6 +263,7 @@ if(WITH_TOOLS)
+     target_link_libraries(
+       osrm-components
+       ${GDAL_LIBRARIES} ${Boost_LIBRARIES} FINGERPRINT GITDESCRIPTION COORDLIB)
++    install(TARGETS osrm-components RUNTIME DESTINATION bin)
+   else()
+     message(FATAL_ERROR "libgdal and/or development headers not found")
+   endif()
+@@ -277,6 +278,9 @@ if(WITH_TOOLS)
+     target_link_libraries(osrm-unlock-all rt)
+   endif()
+ endif()
++install(TARGETS osrm-extract RUNTIME DESTINATION bin)
++install(TARGETS osrm-prepare RUNTIME DESTINATION bin)
++install(TARGETS osrm-routed RUNTIME DESTINATION bin)
+ 
+ file(GLOB InstallGlob Include/osrm/*.h Library/OSRM.h)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 9c427cd..7bc5115 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-add-cmake-install
+add-cmake-install.patch

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