From 5fe80144ecb3a2b369b8d42a5a01ad67173ea071 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Fri, 12 Jul 2013 06:57:48 +0200
Subject: [PATCH] genmsg: updated to hydro release version

To update to the hydro release version, the genmsg patch required
some minor adjustments.
---
 ...ile-handling-to-reference-them-relatively.patch | 14 +++++++-------
 .../genmsg/{genmsg_0.4.17.bb => genmsg_0.4.21.bb}  |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename recipes-ros/genmsg/{genmsg_0.4.17.bb => genmsg_0.4.21.bb} (79%)

diff --git a/recipes-ros/genmsg/genmsg/0001-modify-msg-file-handling-to-reference-them-relatively.patch b/recipes-ros/genmsg/genmsg/0001-modify-msg-file-handling-to-reference-them-relatively.patch
index 2827d95..e32f6d2 100644
--- a/recipes-ros/genmsg/genmsg/0001-modify-msg-file-handling-to-reference-them-relatively.patch
+++ b/recipes-ros/genmsg/genmsg/0001-modify-msg-file-handling-to-reference-them-relatively.patch
@@ -1,21 +1,21 @@
 diff -Naur a/cmake/genmsg-extras.cmake.em b/cmake/genmsg-extras.cmake.em
---- a/cmake/genmsg-extras.cmake.em	2013-05-23 09:45:59.000000000 +0200
-+++ b/cmake/genmsg-extras.cmake.em	2013-05-23 09:48:56.000000000 +0200
-@@ -172,8 +172,7 @@
+--- a/cmake/genmsg-extras.cmake.em	2013-07-12 09:10:43.810555389 +0200
++++ b/cmake/genmsg-extras.cmake.em	2013-07-12 09:14:17.122564232 +0200
+@@ -202,8 +202,7 @@
      ${CATKIN_DEVEL_PREFIX}/share/${PROJECT_NAME}/cmake/${PROJECT_NAME}-msg-paths.cmake
      @@ONLY)
    # generate and install config of message include dirs for project
--  _prepend_path(${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME} "${${PROJECT_NAME}_MSG_INCLUDE_DIRS_INSTALLSPACE}" INCLUDE_DIRS_W_PATH)
+-  _prepend_path(${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME} "${${PROJECT_NAME}_MSG_INCLUDE_DIRS_INSTALLSPACE}" INCLUDE_DIRS_W_PATH UNIQUE)
 -  set(PKG_MSG_INCLUDE_DIRS "${INCLUDE_DIRS_W_PATH}")
 +  set(PKG_MSG_INCLUDE_DIRS "${${PROJECT_NAME}_MSG_INCLUDE_DIRS_INSTALLSPACE}")
    configure_file(
      ${genmsg_CMAKE_DIR}/pkg-msg-paths.cmake.in
      ${CMAKE_CURRENT_BINARY_DIR}/catkin_generated/installspace/${PROJECT_NAME}-msg-paths.cmake
 diff -Naur a/cmake/pkg-msg-paths.cmake.in b/cmake/pkg-msg-paths.cmake.in
---- a/cmake/pkg-msg-paths.cmake.in	2013-05-23 09:45:59.000000000 +0200
-+++ b/cmake/pkg-msg-paths.cmake.in	2013-05-23 11:03:04.000000000 +0200
+--- a/cmake/pkg-msg-paths.cmake.in	2013-07-12 09:10:43.814555390 +0200
++++ b/cmake/pkg-msg-paths.cmake.in	2013-07-12 09:15:35.818567495 +0200
 @@ -1,2 +1,7 @@
--set(@PROJECT_NAME@_MSG_INCLUDE_DIRS @PKG_MSG_INCLUDE_DIRS@)
+-set(@PROJECT_NAME@_MSG_INCLUDE_DIRS "@PKG_MSG_INCLUDE_DIRS@")
 +if(@DEVELSPACE@)
 +  set(@PROJECT_NAME@_MSG_INCLUDE_DIRS @PKG_MSG_INCLUDE_DIRS@)
 +else()
diff --git a/recipes-ros/genmsg/genmsg_0.4.17.bb b/recipes-ros/genmsg/genmsg_0.4.21.bb
similarity index 79%
rename from recipes-ros/genmsg/genmsg_0.4.17.bb
rename to recipes-ros/genmsg/genmsg_0.4.21.bb
index b45e2f9..c7d59d0 100644
--- a/recipes-ros/genmsg/genmsg_0.4.17.bb
+++ b/recipes-ros/genmsg/genmsg_0.4.21.bb
@@ -12,7 +12,7 @@ SRC_URI = "https://github.com/ros/${BPN}/archive/${PV}.tar.gz;downloadfilename=$
 RDEPENDS_${PN} = "python-stringold python-pprint"
 RDEPENDS_${PN}_class-native = ""
 
-SRC_URI[md5sum] = "de385f1796bf025915ed7b20e1e1acc4"
-SRC_URI[sha256sum] = "e510caa7692a4b0a0948688b9d2d8f6ff2f329980d7f78787276afec030806b7"
+SRC_URI[md5sum] = "03ff82b1efa75552d4a5a000e0576cc4"
+SRC_URI[sha256sum] = "e7e4b23eadb97b0deca53874532c0b42f10f406a9db2affd7d6f04101a4a2901"
 
 inherit catkin