[catkin] 02/02: Update ROS_PACKAGE_PATH 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 catkin.

commit 2aa90f216df3c35880a84d494b5377e97d624ec6
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sat Jun 6 15:33:10 2015 +0200

    Update ROS_PACKAGE_PATH patch
---
 .../0004-Export-ROS_PACKAGE_PATH-in-setup.sh.patch | 20 ----------------
 ...05-Use-profile.d-in-usr-in-_setup_util.py.patch | 28 ++++++++++++++++++++++
 debian/patches/series                              |  2 +-
 3 files changed, 29 insertions(+), 21 deletions(-)

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
deleted file mode 100644
index 738dd0c..0000000
--- a/debian/patches/0004-Export-ROS_PACKAGE_PATH-in-setup.sh.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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 25cd770..7b1eb23 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/0005-Use-profile.d-in-usr-in-_setup_util.py.patch b/debian/patches/0005-Use-profile.d-in-usr-in-_setup_util.py.patch
new file mode 100644
index 0000000..fbb5bb6
--- /dev/null
+++ b/debian/patches/0005-Use-profile.d-in-usr-in-_setup_util.py.patch
@@ -0,0 +1,28 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Sat, 6 Jun 2015 15:29:55 +0200
+Subject: Use profile.d in /usr in _setup_util.py
+
+---
+ cmake/templates/_setup_util.py.in | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/cmake/templates/_setup_util.py.in b/cmake/templates/_setup_util.py.in
+index 47721ad..06c1693 100755
+--- a/cmake/templates/_setup_util.py.in
++++ b/cmake/templates/_setup_util.py.in
+@@ -211,6 +211,15 @@ def find_env_hooks(environ, cmake_prefix_path):
+     specific_env_hook_ext = environ['CATKIN_SHELL'] if not IS_WINDOWS and 'CATKIN_SHELL' in environ and environ['CATKIN_SHELL'] else None
+     # remove non-workspace paths
+     workspaces = [path for path in cmake_prefix_path.split(os.pathsep) if path and os.path.isfile(os.path.join(path, CATKIN_MARKER_FILE))]
++
++    workspace = '/usr/share'
++    env_hook_dir = os.path.join(workspace, 'catkin', 'cmake', 'profile.d')
++    for filename in sorted(os.listdir(env_hook_dir)):
++        # append env hook
++        generic_env_hooks.append(os.path.join(env_hook_dir, filename))
++        generic_env_hooks_workspace.append(workspace)
++        generic_env_hooks_by_filename[filename] = generic_env_hooks[-1]
++
+     for workspace in reversed(workspaces):
+         env_hook_dir = os.path.join(workspace, 'etc', 'catkin', 'profile.d')
+         if os.path.isdir(env_hook_dir):
diff --git a/debian/patches/series b/debian/patches/series
index a1545a9..836abda 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 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
 0005-Fix-location-of-etc-for-catkin_find.patch
+0005-Use-profile.d-in-usr-in-_setup_util.py.patch

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