[catkin] 04/05: Update patches

[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 9dee633073e4dc181bbe425e717f0a6bbdf31d11
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Thu Apr 23 23:41:59 2015 +0200

    Update patches
---
 ...Remove-NO_DEFAULT_PATH-and-NO_CMAKE_FIND_ROOT_PATH-f.patch | 11 +++++------
 debian/patches/0004-Export-ROS_PACKAGE_PATH-in-setup.sh.patch |  2 +-
 debian/patches/0005-Fix-location-of-etc-for-catkin_find.patch |  6 +++---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/debian/patches/0001-Remove-NO_DEFAULT_PATH-and-NO_CMAKE_FIND_ROOT_PATH-f.patch b/debian/patches/0001-Remove-NO_DEFAULT_PATH-and-NO_CMAKE_FIND_ROOT_PATH-f.patch
index 44fdb9e..2b5416a 100644
--- a/debian/patches/0001-Remove-NO_DEFAULT_PATH-and-NO_CMAKE_FIND_ROOT_PATH-f.patch
+++ b/debian/patches/0001-Remove-NO_DEFAULT_PATH-and-NO_CMAKE_FIND_ROOT_PATH-f.patch
@@ -3,22 +3,21 @@ Date: Tue, 9 Dec 2014 01:00:22 +0100
 Subject: Remove NO_DEFAULT_PATH and NO_CMAKE_FIND_ROOT_PATH from find_package
 
 ---
- cmake/catkinConfig.cmake.in | 10 ++++------
- cmake/toplevel.cmake        |  3 +--
- 2 files changed, 5 insertions(+), 8 deletions(-)
+ cmake/catkinConfig.cmake.in | 9 +++------
+ cmake/toplevel.cmake        | 3 +--
+ 2 files changed, 4 insertions(+), 8 deletions(-)
 
 diff --git a/cmake/catkinConfig.cmake.in b/cmake/catkinConfig.cmake.in
-index 2183ce8..c222f7b 100644
+index 2183ce8..5193474 100644
 --- a/cmake/catkinConfig.cmake.in
 +++ b/cmake/catkinConfig.cmake.in
-@@ -72,14 +72,12 @@ if(catkin_FIND_COMPONENTS)
+@@ -72,14 +72,11 @@ if(catkin_FIND_COMPONENTS)
  
        # find package component
        if(catkin_FIND_REQUIRED)
 -        find_package(${component} REQUIRED NO_MODULE PATHS ${paths}
 -          NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
 +        find_package(${component} REQUIRED NO_MODULE PATHS ${paths})
-+          
        elseif(catkin_FIND_QUIETLY)
 -        find_package(${component} QUIET NO_MODULE PATHS ${paths}
 -          NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
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
index 6f58bd5..738dd0c 100644
--- a/debian/patches/0004-Export-ROS_PACKAGE_PATH-in-setup.sh.patch
+++ b/debian/patches/0004-Export-ROS_PACKAGE_PATH-in-setup.sh.patch
@@ -7,7 +7,7 @@ Subject: Export ROS_PACKAGE_PATH in setup.sh
  1 file changed, 1 insertion(+)
 
 diff --git a/cmake/templates/setup.sh.in b/cmake/templates/setup.sh.in
-index a47611b..0ecc533 100644
+index 25cd770..7b1eb23 100644
 --- a/cmake/templates/setup.sh.in
 +++ b/cmake/templates/setup.sh.in
 @@ -10,6 +10,7 @@
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
index 28957ec..dd9c3c7 100644
--- a/debian/patches/0005-Fix-location-of-etc-for-catkin_find.patch
+++ b/debian/patches/0005-Fix-location-of-etc-for-catkin_find.patch
@@ -7,13 +7,13 @@ Subject: Fix location of /etc for catkin_find
  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
+index 4d5623e..d7e0b80 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
+@@ -123,6 +123,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')
+                 p = os.path.join(workspace, sub)
 +                if p == '/usr/etc':
 +                    p = '/etc'
                  if project:

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