[ros-robot-model] 04/05: Add patch for new catkin

Jochen Sprickerhof jspricke at moszumanska.debian.org
Tue Sep 20 17:15:31 UTC 2016


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

jspricke pushed a commit to annotated tag debian/1.12.4-1
in repository ros-robot-model.

commit 29d3e845b15c5e8f358427839b59d322c1a8ea6c
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Sep 20 19:05:42 2016 +0200

    Add patch for new catkin
---
 debian/patches/0004-Fix-catkin-dependency.patch | 21 +++++++++++++++++++++
 debian/patches/series                           |  1 +
 2 files changed, 22 insertions(+)

diff --git a/debian/patches/0004-Fix-catkin-dependency.patch b/debian/patches/0004-Fix-catkin-dependency.patch
new file mode 100644
index 0000000..18b5197
--- /dev/null
+++ b/debian/patches/0004-Fix-catkin-dependency.patch
@@ -0,0 +1,21 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Tue, 20 Sep 2016 19:00:58 +0200
+Subject: Fix catkin dependency
+
+---
+ urdf/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt
+index 1a5c582..3da3e5d 100644
+--- a/urdf/CMakeLists.txt
++++ b/urdf/CMakeLists.txt
+@@ -17,7 +17,7 @@ catkin_package(
+   LIBRARIES ${PROJECT_NAME}
+   INCLUDE_DIRS include ${TinyXML_INLCLUDE_DIRS}
+   CATKIN_DEPENDS rosconsole_bridge roscpp
+-  DEPENDS urdfdom_headers urdfdom Boost pcrecpp
++  DEPENDS urdfdom_headers urdfdom Boost libpcrecpp
+ )
+ 
+ include_directories(SYSTEM ${Boost_INCLUDE_DIR})
diff --git a/debian/patches/series b/debian/patches/series
index 52393b7..6513175 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Add-CMakeLists.txt.patch
 0002-Add-Debian-specific-SOVERSION.patch
 0003-Use-urdf-ShredPtr-instead-of-boost-shared_ptr.patch
+0004-Fix-catkin-dependency.patch

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



More information about the debian-science-commits mailing list