[ros-geometry2] 12/14: rebase patches

[Jochen Sprickerhof]

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

jspricke pushed a commit to branch master
in repository ros-geometry2.

commit 3f97bb68f32887ec424db9310ff2f61235da367e
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sat Sep 30 10:26:17 2017 +0200

    rebase patches
---
 debian/patches/0002-Add-Debian-specific-SONAME.patch           | 10 +++++-----
 ...-Don-t-set-RPATH-on-tf2_py-Python-library-Debian-spec.patch |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/0002-Add-Debian-specific-SONAME.patch b/debian/patches/0002-Add-Debian-specific-SONAME.patch
index deadb63..9a2cdd7 100644
--- a/debian/patches/0002-Add-Debian-specific-SONAME.patch
+++ b/debian/patches/0002-Add-Debian-specific-SONAME.patch
@@ -8,24 +8,24 @@ Subject: Add Debian specific SONAME
  2 files changed, 2 insertions(+)
 
 diff --git a/tf2/CMakeLists.txt b/tf2/CMakeLists.txt
-index b4c425f..a867fb6 100644
+index 0d5754f..f922973 100644
 --- a/tf2/CMakeLists.txt
 +++ b/tf2/CMakeLists.txt
-@@ -19,6 +19,7 @@ include_directories (src/bt)
+@@ -19,6 +19,7 @@ include_directories(include ${catkin_INCLUDE_DIRS} ${console_bridge_INCLUDE_DIRS
  #CPP Libraries
  add_library(tf2 src/cache.cpp src/buffer_core.cpp src/static_cache.cpp)
  target_link_libraries(tf2 ${Boost_LIBRARIES} ${catkin_LIBRARIES} ${console_bridge_LIBRARIES})
 +set_target_properties(tf2 PROPERTIES VERSION ${tf2_VERSION} SOVERSION "0d")
- add_dependencies(tf2 tf2_msgs_gencpp)
+ add_dependencies(tf2 ${catkin_EXPORTED_TARGETS})
  
  install(TARGETS tf2
 diff --git a/tf2_ros/CMakeLists.txt b/tf2_ros/CMakeLists.txt
-index bfd0be5..8fe7808 100644
+index df02f86..1e4efbc 100644
 --- a/tf2_ros/CMakeLists.txt
 +++ b/tf2_ros/CMakeLists.txt
 @@ -49,6 +49,7 @@ add_library(${PROJECT_NAME}
  )
- add_dependencies(${PROJECT_NAME} tf2_msgs_gencpp)
+ add_dependencies(${PROJECT_NAME} ${catkin_EXPORTED_TARGETS})
  target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES})
 +set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${tf2_ros_VERSION} SOVERSION "0d")
  
diff --git a/debian/patches/0005-Don-t-set-RPATH-on-tf2_py-Python-library-Debian-spec.patch b/debian/patches/0005-Don-t-set-RPATH-on-tf2_py-Python-library-Debian-spec.patch
index 2a94a04..9ce858d 100644
--- a/debian/patches/0005-Don-t-set-RPATH-on-tf2_py-Python-library-Debian-spec.patch
+++ b/debian/patches/0005-Don-t-set-RPATH-on-tf2_py-Python-library-Debian-spec.patch
@@ -10,7 +10,7 @@ location and don't need an RPATH accordingly.
  1 file changed, 1 insertion(+)
 
 diff --git a/tf2_py/CMakeLists.txt b/tf2_py/CMakeLists.txt
-index fd70b0e..7e61ba0 100644
+index dbf9649..81379f4 100644
 --- a/tf2_py/CMakeLists.txt
 +++ b/tf2_py/CMakeLists.txt
 @@ -99,6 +99,7 @@ set_target_properties(tf2_py PROPERTIES COMPILE_FLAGS "-g -Wno-missing-field-ini

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-geometry2.git