[ros-catkin] 02/04: Refresh 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 ros-catkin.

commit 223af40e8f54c10223a02ca9eb17f54f4b9a63ff
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sat Jun 18 10:47:17 2016 +0200

    Refresh patches
---
 ...EFAULT_PATH-and-NO_CMAKE_FIND_ROOT_PATH-f.patch | 25 +++++++++++++++-------
 .../0005-Fix-location-of-etc-for-catkin_find.patch |  4 ++--
 ...05-Use-profile.d-in-usr-in-_setup_util.py.patch |  6 +++---
 3 files changed, 22 insertions(+), 13 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 2b5416a..3245564 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,21 +3,30 @@ 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 | 9 +++------
- cmake/toplevel.cmake        | 3 +--
- 2 files changed, 4 insertions(+), 8 deletions(-)
+ cmake/catkinConfig.cmake.in | 12 ++++--------
+ cmake/toplevel.cmake        |  3 +--
+ 2 files changed, 5 insertions(+), 10 deletions(-)
 
 diff --git a/cmake/catkinConfig.cmake.in b/cmake/catkinConfig.cmake.in
-index 2183ce8..5193474 100644
+index 8afb6df..7f2ce48 100644
 --- a/cmake/catkinConfig.cmake.in
 +++ b/cmake/catkinConfig.cmake.in
-@@ -72,14 +72,11 @@ if(catkin_FIND_COMPONENTS)
- 
+@@ -73,22 +73,18 @@ if(catkin_FIND_COMPONENTS)
        # find package component
        if(catkin_FIND_REQUIRED)
--        find_package(${component} REQUIRED NO_MODULE PATHS ${paths}
+         # try without REQUIRED first
+-        find_package(${component} NO_MODULE PATHS ${paths}
 -          NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-+        find_package(${component} REQUIRED NO_MODULE PATHS ${paths})
++        find_package(${component} NO_MODULE PATHS ${paths})
+         if(NOT ${component}_FOUND)
+           # show better message to help users with the CMake error message coming up
+           message(STATUS "Could not find the required component '${component}'. "
+             "The following CMake error indicates that you either need to install the package "
+             "with the same name or change your environment so that it can be found.")
+-          find_package(${component} REQUIRED NO_MODULE PATHS ${paths}
+-            NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++          find_package(${component} REQUIRED NO_MODULE PATHS ${paths})
+         endif()
        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/0005-Fix-location-of-etc-for-catkin_find.patch b/debian/patches/0005-Fix-location-of-etc-for-catkin_find.patch
index 8770126..62413b1 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,10 +7,10 @@ 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 0c74f0a..8ef3ad6 100644
+index 83b5a0a..2e15f98 100644
 --- a/python/catkin/find_in_workspaces.py
 +++ b/python/catkin/find_in_workspaces.py
-@@ -123,6 +123,8 @@ def find_in_workspaces(search_dirs=None, project=None, path=None, _workspaces=ge
+@@ -124,6 +124,8 @@ def find_in_workspaces(search_dirs=None, project=None, path=None, _workspaces=No
              for sub in search_dirs:
                  # search in workspace
                  p = os.path.join(workspace, sub)
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
index b7ec07e..755cdd8 100644
--- 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
@@ -7,10 +7,10 @@ Subject: Use profile.d in /usr in _setup_util.py
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/cmake/templates/_setup_util.py.in b/cmake/templates/_setup_util.py.in
-index 47721ad..6a29452 100755
+index cace21c..89c85e2 100755
 --- a/cmake/templates/_setup_util.py.in
 +++ b/cmake/templates/_setup_util.py.in
-@@ -211,6 +211,7 @@ def find_env_hooks(environ, cmake_prefix_path):
+@@ -213,6 +213,7 @@ 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))]
@@ -18,7 +18,7 @@ index 47721ad..6a29452 100755
      for workspace in reversed(workspaces):
          env_hook_dir = os.path.join(workspace, 'etc', 'catkin', 'profile.d')
          if os.path.isdir(env_hook_dir):
-@@ -241,7 +242,7 @@ def find_env_hooks(environ, cmake_prefix_path):
+@@ -243,7 +244,7 @@ def find_env_hooks(environ, cmake_prefix_path):
      lines.append(assignment('_CATKIN_ENVIRONMENT_HOOKS_COUNT', count))
      for i in range(count):
          lines.append(assignment('_CATKIN_ENVIRONMENT_HOOKS_%d' % i, env_hooks[i]))

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