[catkin] 01/01: Add patch for catkin_find --etc

[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 bf431c063bab29c58f870bdb22e271b9e6e5ec1c
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Thu Apr 2 11:16:58 2015 +0200

    Add patch for catkin_find --etc
---
 .../0005-Fix-location-of-etc-for-catkin_find.patch  | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 2 files changed, 22 insertions(+)

diff --git a/debian/patches/0005-Fix-location-of-etc-for-catkin_find.patch b/debian/patches/0005-Fix-location-of-etc-for-catkin_find.patch
new file mode 100644
index 0000000..28957ec
--- /dev/null
+++ b/debian/patches/0005-Fix-location-of-etc-for-catkin_find.patch
@@ -0,0 +1,21 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Thu, 2 Apr 2015 11:13:21 +0200
+Subject: Fix location of /etc for catkin_find
+
+---
+ python/catkin/find_in_workspaces.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/python/catkin/find_in_workspaces.py b/python/catkin/find_in_workspaces.py
+index a875731..d7096de 100644
+--- a/python/catkin/find_in_workspaces.py
++++ b/python/catkin/find_in_workspaces.py
+@@ -121,6 +121,8 @@ def find_in_workspaces(search_dirs=None, project=None, path=None, _workspaces=ge
+             for sub in search_dirs:
+                 # search in workspace
+                 p = os.path.join(workspace, sub if sub != 'libexec' else 'lib')
++                if p == '/usr/etc':
++                    p = '/etc'
+                 if project:
+                     p = os.path.join(p, project)
+                 if path:
diff --git a/debian/patches/series b/debian/patches/series
index 30133d1..a1545a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 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

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