[ros-ros-control] 01/01: Update catkin_package patch

[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-ros-control.

commit 21a2c965232acb1c75e1e677e28be4abcfd44b46
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Jan 19 11:23:09 2016 +0100

    Update catkin_package patch
---
 .../0003-Don-t-export-local-include-dirs.patch     | 21 ---------------
 debian/patches/0003-Fix-catkin_package.patch       | 31 ++++++++++++++++++++++
 debian/patches/series                              |  2 +-
 3 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/debian/patches/0003-Don-t-export-local-include-dirs.patch b/debian/patches/0003-Don-t-export-local-include-dirs.patch
deleted file mode 100644
index 9c9e25d..0000000
--- a/debian/patches/0003-Don-t-export-local-include-dirs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Mon, 18 Jan 2016 14:24:36 +0100
-Subject: Don't export local include dirs
-
----
- joint_limits_interface/CMakeLists.txt | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/joint_limits_interface/CMakeLists.txt b/joint_limits_interface/CMakeLists.txt
-index 00644ea..ccab8f8 100644
---- a/joint_limits_interface/CMakeLists.txt
-+++ b/joint_limits_interface/CMakeLists.txt
-@@ -21,8 +21,6 @@ catkin_package(
-     hardware_interface
-   INCLUDE_DIRS
-     include
--    ${catkin_INCLUDE_DIRS}
--    ${urdfdom_INCLUDE_DIRS}
-   LIBRARIES
-     ${catkin_LIBRARIES}
-     ${urdfdom_LIBRARIES}
diff --git a/debian/patches/0003-Fix-catkin_package.patch b/debian/patches/0003-Fix-catkin_package.patch
new file mode 100644
index 0000000..3e9a18f
--- /dev/null
+++ b/debian/patches/0003-Fix-catkin_package.patch
@@ -0,0 +1,31 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Mon, 18 Jan 2016 14:24:36 +0100
+Subject: Fix catkin_package
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+* Don't export local include dirs.
+* Fix dependency on urdfdom (Thanks to Mathias Lüdtke).
+---
+ joint_limits_interface/CMakeLists.txt | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/joint_limits_interface/CMakeLists.txt b/joint_limits_interface/CMakeLists.txt
+index 00644ea..69252f7 100644
+--- a/joint_limits_interface/CMakeLists.txt
++++ b/joint_limits_interface/CMakeLists.txt
+@@ -21,11 +21,8 @@ catkin_package(
+     hardware_interface
+   INCLUDE_DIRS
+     include
+-    ${catkin_INCLUDE_DIRS}
+-    ${urdfdom_INCLUDE_DIRS}
+-  LIBRARIES
+-    ${catkin_LIBRARIES}
+-    ${urdfdom_LIBRARIES}
++  DEPENDS
++    urdfdom
+ )
+ 
+ if(CATKIN_ENABLE_TESTING)
diff --git a/debian/patches/series b/debian/patches/series
index ceff8f0..0dde556 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 0001-Add-CMakeLists.txt.patch
 0002-Add-Debian-specific-SOVERSION.patch
-0003-Don-t-export-local-include-dirs.patch
+0003-Fix-catkin_package.patch

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