[catkin] 01/01: Add patch for ROS_PACKAGE_PATH

[Jochen Sprickerhof]

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

jspricke-guest pushed a commit to branch master
in repository catkin.

commit c7c342c7ff690e875c0711be03fd884d77418019
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Dec 15 14:39:51 2014 +0100

    Add patch for ROS_PACKAGE_PATH
---
 .../0004-Export-ROS_PACKAGE_PATH-in-setup.sh.patch   | 20 ++++++++++++++++++++
 debian/patches/series                                |  1 +
 2 files changed, 21 insertions(+)

diff --git a/debian/patches/0004-Export-ROS_PACKAGE_PATH-in-setup.sh.patch b/debian/patches/0004-Export-ROS_PACKAGE_PATH-in-setup.sh.patch
new file mode 100644
index 0000000..6f58bd5
--- /dev/null
+++ b/debian/patches/0004-Export-ROS_PACKAGE_PATH-in-setup.sh.patch
@@ -0,0 +1,20 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Mon, 15 Dec 2014 14:38:19 +0100
+Subject: Export ROS_PACKAGE_PATH in setup.sh
+
+---
+ cmake/templates/setup.sh.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cmake/templates/setup.sh.in b/cmake/templates/setup.sh.in
+index a47611b..0ecc533 100644
+--- a/cmake/templates/setup.sh.in
++++ b/cmake/templates/setup.sh.in
+@@ -10,6 +10,7 @@
+ # or fall back to the destination set at configure time
+ : ${_CATKIN_SETUP_DIR:=@SETUP_DIR@}
+ _SETUP_UTIL="$_CATKIN_SETUP_DIR/_setup_util.py"
++export ROS_PACKAGE_PATH=${_CATKIN_SETUP_DIR}:${ROS_PACKAGE_PATH}
+ unset _CATKIN_SETUP_DIR
+ 
+ if [ ! -f "$_SETUP_UTIL" ]; then
diff --git a/debian/patches/series b/debian/patches/series
index 947cf0a..30133d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Remove-NO_DEFAULT_PATH-and-NO_CMAKE_FIND_ROOT_PATH-f.patch
 0002-Add-usr-as-default-workspace-path.patch
 0003-Don-t-add-default-paths-to-pkg-config-file.patch
+0004-Export-ROS_PACKAGE_PATH-in-setup.sh.patch

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