[ros-geometry-experimental] 02/04: Refresh patches

[Jochen Sprickerhof]

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

jspricke-guest pushed a commit to branch master
in repository ros-geometry-experimental.

commit 2dac4147de2b53752ee437e3505747cb20fbdfc4
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun Jul 10 10:32:26 2016 +0200

    Refresh patches
---
 ...Remove-old-load_manifest-from-view_frames.patch |  2 +-
 ...ort-catkin-includes-into-tf2-Config.cmake.patch | 36 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/debian/patches/0003-Remove-old-load_manifest-from-view_frames.patch b/debian/patches/0003-Remove-old-load_manifest-from-view_frames.patch
index 3077b96..724372e 100644
--- a/debian/patches/0003-Remove-old-load_manifest-from-view_frames.patch
+++ b/debian/patches/0003-Remove-old-load_manifest-from-view_frames.patch
@@ -7,7 +7,7 @@ Subject: Remove old load_manifest from view_frames
  1 file changed, 1 deletion(-)
 
 diff --git a/tf2_tools/scripts/view_frames.py b/tf2_tools/scripts/view_frames.py
-index 6f7a5f4..b894800 100755
+index b1247ac..0268430 100755
 --- a/tf2_tools/scripts/view_frames.py
 +++ b/tf2_tools/scripts/view_frames.py
 @@ -28,7 +28,6 @@
diff --git a/debian/patches/0004-Don-t-export-catkin-includes-into-tf2-Config.cmake.patch b/debian/patches/0004-Don-t-export-catkin-includes-into-tf2-Config.cmake.patch
deleted file mode 100644
index 238a437..0000000
--- a/debian/patches/0004-Don-t-export-catkin-includes-into-tf2-Config.cmake.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Tue, 10 Nov 2015 22:13:39 +0100
-Subject: Don't export catkin includes into tf2*Config.cmake
-
-They only include the temporary include in the build directory.
----
- tf2_bullet/CMakeLists.txt | 2 +-
- tf2_kdl/CMakeLists.txt    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tf2_bullet/CMakeLists.txt b/tf2_bullet/CMakeLists.txt
-index dd4cc04..3b10ea2 100644
---- a/tf2_bullet/CMakeLists.txt
-+++ b/tf2_bullet/CMakeLists.txt
-@@ -10,7 +10,7 @@ find_package(catkin REQUIRED COMPONENTS geometry_msgs tf2)
- 
- include_directories(include ${bullet_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
- 
--catkin_package(INCLUDE_DIRS include ${bullet_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
-+catkin_package(INCLUDE_DIRS include ${bullet_INCLUDE_DIRS})
- 
- install(DIRECTORY include/${PROJECT_NAME}/
-         DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})
-diff --git a/tf2_kdl/CMakeLists.txt b/tf2_kdl/CMakeLists.txt
-index 1e35e1f..ca1415f 100644
---- a/tf2_kdl/CMakeLists.txt
-+++ b/tf2_kdl/CMakeLists.txt
-@@ -7,7 +7,7 @@ find_package(catkin REQUIRED COMPONENTS cmake_modules tf2 tf2_ros tf2_msgs)
- find_package(Eigen REQUIRED)
- 
- catkin_package(
--  INCLUDE_DIRS include ${catkin_INCLUDE_DIRS} ${Eigen_INCLUDE_DIRS}
-+  INCLUDE_DIRS include ${Eigen_INCLUDE_DIRS}
-   DEPENDS Eigen orocos_kdl
- )
- 
diff --git a/debian/patches/series b/debian/patches/series
index 1624ef5..f3063d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 0001-Added-CMakeLists-to-build-the-package.patch
 0002-Add-Debian-specific-SONAME.patch
 0003-Remove-old-load_manifest-from-view_frames.patch
-0004-Don-t-export-catkin-includes-into-tf2-Config.cmake.patch
 0005-Don-t-set-RPATH-on-tf2_py-Python-library-Debian-spec.patch
 0006-Don-t-export-local-include-dirs.patch

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