[ros-geometry2] 02/14: Rebase patch

[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 dae6f73c0e51449b41b1b727ac6ea10120204286
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Jun 23 18:30:48 2017 +0200

    Rebase patch
---
 ...-Remove-old-load_manifest-from-view_frames.patch | 20 --------------------
 .../0006-Don-t-export-local-include-dirs.patch      | 21 ---------------------
 debian/patches/series                               |  2 --
 3 files changed, 43 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
deleted file mode 100644
index 724372e..0000000
--- a/debian/patches/0003-Remove-old-load_manifest-from-view_frames.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Sun, 9 Aug 2015 09:33:21 +0200
-Subject: Remove old load_manifest from view_frames
-
----
- tf2_tools/scripts/view_frames.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/tf2_tools/scripts/view_frames.py b/tf2_tools/scripts/view_frames.py
-index b1247ac..0268430 100755
---- a/tf2_tools/scripts/view_frames.py
-+++ b/tf2_tools/scripts/view_frames.py
-@@ -28,7 +28,6 @@
- 
- # author: Wim Meeussen
- 
--import roslib; roslib.load_manifest('tf2_tools')
- import rospy
- import tf2_py as tf2
- import yaml
diff --git a/debian/patches/0006-Don-t-export-local-include-dirs.patch b/debian/patches/0006-Don-t-export-local-include-dirs.patch
deleted file mode 100644
index 806b3fa..0000000
--- a/debian/patches/0006-Don-t-export-local-include-dirs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Fri, 24 Jun 2016 10:54:52 +0200
-Subject: Don't export local include dirs
-
----
- tf2_eigen/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tf2_eigen/CMakeLists.txt b/tf2_eigen/CMakeLists.txt
-index 1de58d9..d47b762 100644
---- a/tf2_eigen/CMakeLists.txt
-+++ b/tf2_eigen/CMakeLists.txt
-@@ -14,7 +14,7 @@ add_definitions(${EIGEN_DEFINITIONS})
- include_directories(include)
- 
- catkin_package(
--  INCLUDE_DIRS include ${catkin_INCLUDE_DIRS}
-+  INCLUDE_DIRS include
-   DEPENDS eigen)
- 
- install(DIRECTORY include/${PROJECT_NAME}/
diff --git a/debian/patches/series b/debian/patches/series
index f3063d5..8ed80cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 0001-Added-CMakeLists-to-build-the-package.patch
 0002-Add-Debian-specific-SONAME.patch
-0003-Remove-old-load_manifest-from-view_frames.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-geometry2.git