[ros-robot-model] 01/01: Update catkin 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-robot-model.

commit 6f29b8795827e7278b121ebdfa722dbeb98a184c
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Sep 23 08:49:44 2016 +0200

    Update catkin patch
---
 debian/control                                     |  2 +-
 debian/patches/0004-Fix-catkin-dependency.patch    | 21 ----------------
 ...-Remove-unneeded-dependency-on-libpcrecpp.patch | 28 ++++++++++++++++++++++
 debian/patches/series                              |  2 +-
 4 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/debian/control b/debian/control
index afabf0f..166f3d0 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 Uploaders: Thomas Moulard <thomas.moulard at gmail.com>,
            Jochen Sprickerhof <jspricke at debian.org>,
            Leopold Palomo-Avellaneda <leo at alaxarxa.net>
-Build-Depends: debhelper (>= 9), catkin (>= 0.6.16-4), libboost-system-dev, liburdfdom-headers-dev, libboost-thread-dev, liburdfdom-dev, pluginlib-dev, librosconsole-bridge-dev, libroscpp-dev, ros-cmake-modules, libtinyxml-dev, libclass-loader-dev, libangles-dev, libresource-retriever-dev, libgeometric-shapes-dev, libtf-dev, libassimp-dev, libboost-filesystem-dev, libboost-program-options-dev, libcollada-dom2.4-dp-dev, liborocos-kdl-dev, librostest-dev, libpcre3-dev, liboctomap-dev, pyth [...]
+Build-Depends: debhelper (>= 9), catkin (>= 0.6.16-4), libboost-system-dev, liburdfdom-headers-dev, libboost-thread-dev, liburdfdom-dev, pluginlib-dev, librosconsole-bridge-dev, libroscpp-dev, ros-cmake-modules, libtinyxml-dev, libclass-loader-dev, libangles-dev, libresource-retriever-dev, libgeometric-shapes-dev, libtf-dev, libassimp-dev, libboost-filesystem-dev, libboost-program-options-dev, libcollada-dom2.4-dp-dev, liborocos-kdl-dev, librostest-dev, liboctomap-dev, python-all, dh-python
 Standards-Version: 3.9.8
 Section: libs
 Homepage: http://wiki.ros.org/robot_model
diff --git a/debian/patches/0004-Fix-catkin-dependency.patch b/debian/patches/0004-Fix-catkin-dependency.patch
deleted file mode 100644
index 18b5197..0000000
--- a/debian/patches/0004-Fix-catkin-dependency.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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/0004-Remove-unneeded-dependency-on-libpcrecpp.patch b/debian/patches/0004-Remove-unneeded-dependency-on-libpcrecpp.patch
new file mode 100644
index 0000000..466dcdc
--- /dev/null
+++ b/debian/patches/0004-Remove-unneeded-dependency-on-libpcrecpp.patch
@@ -0,0 +1,28 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Tue, 20 Sep 2016 18:51:04 +0200
+Subject: Remove unneeded dependency on libpcrecpp
+
+---
+ urdf/CMakeLists.txt | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt
+index 1a5c582..d2e3524 100644
+--- a/urdf/CMakeLists.txt
++++ b/urdf/CMakeLists.txt
+@@ -10,14 +10,11 @@ find_package(catkin REQUIRED COMPONENTS
+ 
+ find_package(TinyXML REQUIRED)
+ 
+-find_package(PkgConfig)
+-pkg_check_modules(libpcrecpp libpcrecpp)
+-
+ 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
+ )
+ 
+ include_directories(SYSTEM ${Boost_INCLUDE_DIR})
diff --git a/debian/patches/series b/debian/patches/series
index 6513175..9652d33 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +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
+0004-Remove-unneeded-dependency-on-libpcrecpp.patch

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