[ros-ros-control] 02/04: Updated patches to new upstream version

[Leopold Palomo-Avellaneda]

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

lepalom-guest pushed a commit to branch master
in repository ros-ros-control.

commit 6cd7e4917c84472af075f8563a9ae4b5972e4710
Author: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
Date:   Fri Jul 29 08:51:02 2016 +0200

    Updated patches to new upstream version
---
 .../0002-Add-Debian-specific-SOVERSION.patch       |  2 +-
 debian/patches/0003-Fix-catkin_package.patch       | 31 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/debian/patches/0002-Add-Debian-specific-SOVERSION.patch b/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
index e5708c7..7eb6b1d 100644
--- a/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
+++ b/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
@@ -20,7 +20,7 @@ index d44f110..c644344 100644
  if(catkin_EXPORTED_TARGETS)
    add_dependencies(${PROJECT_NAME} ${catkin_EXPORTED_TARGETS})
 diff --git a/transmission_interface/CMakeLists.txt b/transmission_interface/CMakeLists.txt
-index 5e9faf5..7e5bc61 100644
+index bf0e823..2b16b27 100644
 --- a/transmission_interface/CMakeLists.txt
 +++ b/transmission_interface/CMakeLists.txt
 @@ -40,6 +40,7 @@ add_library(${PROJECT_NAME}_parser
diff --git a/debian/patches/0003-Fix-catkin_package.patch b/debian/patches/0003-Fix-catkin_package.patch
deleted file mode 100644
index 3e9a18f..0000000
--- a/debian/patches/0003-Fix-catkin_package.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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 0dde556..c0916ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-Add-CMakeLists.txt.patch
 0002-Add-Debian-specific-SOVERSION.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