Commit a52b4ffe-36cb-42c5-a943-67b564687a66/main - ros-catkin

+8

-8

debian/patches/0001-Remove-NO_DEFAULT_PATH-and-NO_CMAKE_FIND_ROOT_PATH-f.patch less more

6	6	cmake/toplevel.cmake \| 3 +--
7	7	2 files changed, 5 insertions(+), 10 deletions(-)
8	8
9		diff --git a/cmake/catkinConfig.cmake.in b/cmake/catkinConfig.cmake.in
10		index 4d014f5..1dd246e 100644
11		--- a/cmake/catkinConfig.cmake.in
12		+++ b/cmake/catkinConfig.cmake.in
	9	Index: ros-catkin/cmake/catkinConfig.cmake.in
	10	===================================================================
	11	--- ros-catkin.orig/cmake/catkinConfig.cmake.in
	12	+++ ros-catkin/cmake/catkinConfig.cmake.in
13	13	@@ -73,22 +73,18 @@ if(catkin_FIND_COMPONENTS)
14	14	# find package component
15	15	if(catkin_FIND_REQUIRED)

37	37	endif()
38	38
39	39	# append component-specific variables to catkin_* variables
40		diff --git a/cmake/toplevel.cmake b/cmake/toplevel.cmake
41		index b1cf04c..af51353 100644
42		--- a/cmake/toplevel.cmake
43		+++ b/cmake/toplevel.cmake
	40	Index: ros-catkin/cmake/toplevel.cmake
	41	===================================================================
	42	--- ros-catkin.orig/cmake/toplevel.cmake
	43	+++ ros-catkin/cmake/toplevel.cmake
44	44	@@ -55,8 +55,7 @@ else()
45	45	set(CATKIN_TOPLEVEL_FIND_PACKAGE TRUE)
46	46	find_package(catkin QUIET

+8

-8

debian/patches/0002-Add-usr-as-default-workspace-path.patch less more

6	6	test/unit_tests/test_workspace.py \| 10 +++++-----
7	7	2 files changed, 8 insertions(+), 5 deletions(-)
8	8
9		diff --git a/python/catkin/workspace.py b/python/catkin/workspace.py
10		index 0b7583e..294c0fe 100644
11		--- a/python/catkin/workspace.py
12		+++ b/python/catkin/workspace.py
	9	Index: ros-catkin/python/catkin/workspace.py
	10	===================================================================
	11	--- ros-catkin.orig/python/catkin/workspace.py
	12	+++ ros-catkin/python/catkin/workspace.py
13	13	@@ -47,6 +47,7 @@ def get_workspaces():
14	14	paths = [path for path in os.environ.get(env_name, '').split(os.pathsep) if path]
15	15	# remove non-workspace paths

27	27	if not os.path.isfile(filename):
28	28	raise ValueError('Not a catkin workspace: "%s", missing file %s' % (workspace, filename))
29	29	with open(filename) as f:
30		diff --git a/test/unit_tests/test_workspace.py b/test/unit_tests/test_workspace.py
31		index 01f9dea..49e2010 100644
32		--- a/test/unit_tests/test_workspace.py
33		+++ b/test/unit_tests/test_workspace.py
	30	Index: ros-catkin/test/unit_tests/test_workspace.py
	31	===================================================================
	32	--- ros-catkin.orig/test/unit_tests/test_workspace.py
	33	+++ ros-catkin/test/unit_tests/test_workspace.py
34	34	@@ -28,15 +28,15 @@ class WorkspaceTest(unittest.TestCase):
35	35	with open(os.path.join(ws2, CATKIN_MARKER_FILE), 'w') as fhand:
36	36	fhand.write('loc3;loc4')

+4

-4

debian/patches/0003-Don-t-add-default-paths-to-pkg-config-file.patch less more

5	5	cmake/em/pkg.pc.em \| 4 ++--
6	6	1 file changed, 2 insertions(+), 2 deletions(-)
7	7
8		diff --git a/cmake/em/pkg.pc.em b/cmake/em/pkg.pc.em
9		index a4f7257..2015b53 100644
10		--- a/cmake/em/pkg.pc.em
11		+++ b/cmake/em/pkg.pc.em
	8	Index: ros-catkin/cmake/em/pkg.pc.em
	9	===================================================================
	10	--- ros-catkin.orig/cmake/em/pkg.pc.em
	11	+++ ros-catkin/cmake/em/pkg.pc.em
12	12	@@ -3,6 +3,6 @@ prefix=@PROJECT_SPACE_DIR
13	13	Name: @(CATKIN_PACKAGE_PREFIX + PROJECT_NAME)
14	14	Description: Description of @PROJECT_NAME

+5

-5

debian/patches/0005-Fix-location-of-etc-for-catkin_find.patch less more

5	5	python/catkin/find_in_workspaces.py \| 2 ++
6	6	1 file changed, 2 insertions(+)
7	7
8		diff --git a/python/catkin/find_in_workspaces.py b/python/catkin/find_in_workspaces.py
9		index 83b5a0a..2e15f98 100644
10		--- a/python/catkin/find_in_workspaces.py
11		+++ b/python/catkin/find_in_workspaces.py
12		@@ -124,6 +124,8 @@ def find_in_workspaces(search_dirs=None, project=None, path=None, _workspaces=No
	8	Index: ros-catkin/python/catkin/find_in_workspaces.py
	9	===================================================================
	10	--- ros-catkin.orig/python/catkin/find_in_workspaces.py
	11	+++ ros-catkin/python/catkin/find_in_workspaces.py
	12	@@ -124,6 +124,8 @@ def find_in_workspaces(search_dirs=None,
13	13	for sub in search_dirs:
14	14	# search in workspace
15	15	p = os.path.join(workspace, sub)

+6

-6

debian/patches/0005-Use-profile.d-in-usr-in-_setup_util.py.patch less more

5	5	cmake/templates/_setup_util.py.in \| 3 ++-
6	6	1 file changed, 2 insertions(+), 1 deletion(-)
7	7
8		diff --git a/cmake/templates/_setup_util.py.in b/cmake/templates/_setup_util.py.in
9		index d03cd81..b5184c3 100755
10		--- a/cmake/templates/_setup_util.py.in
11		+++ b/cmake/templates/_setup_util.py.in
12		@@ -219,6 +219,7 @@ def find_env_hooks(environ, cmake_prefix_path):
	8	Index: ros-catkin/cmake/templates/_setup_util.py.in
	9	===================================================================
	10	--- ros-catkin.orig/cmake/templates/_setup_util.py.in
	11	+++ ros-catkin/cmake/templates/_setup_util.py.in
	12	@@ -219,6 +219,7 @@ def find_env_hooks(environ, cmake_prefix
13	13	specific_env_hook_ext = environ['CATKIN_SHELL'] if not IS_WINDOWS and 'CATKIN_SHELL' in environ and environ['CATKIN_SHELL'] else None
14	14	# remove non-workspace paths
15	15	workspaces = [path for path in cmake_prefix_path.split(os.pathsep) if path and os.path.isfile(os.path.join(path, CATKIN_MARKER_FILE))]

17	17	for workspace in reversed(workspaces):
18	18	env_hook_dir = os.path.join(workspace, 'etc', 'catkin', 'profile.d')
19	19	if os.path.isdir(env_hook_dir):
20		@@ -249,7 +250,7 @@ def find_env_hooks(environ, cmake_prefix_path):
	20	@@ -249,7 +250,7 @@ def find_env_hooks(environ, cmake_prefix
21	21	lines.append(assignment('_CATKIN_ENVIRONMENT_HOOKS_COUNT', count))
22	22	for i in range(count):
23	23	lines.append(assignment('_CATKIN_ENVIRONMENT_HOOKS_%d' % i, env_hooks[i]))

+10

-10

debian/patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch less more

7	7	cmake/catkin_package.cmake \| 6 +++---
8	8	2 files changed, 15 insertions(+), 3 deletions(-)
9	9
10		diff --git a/cmake/all.cmake b/cmake/all.cmake
11		index d6c3e71..49708e6 100644
12		--- a/cmake/all.cmake
13		+++ b/cmake/all.cmake
14		@@ -173,6 +173,17 @@ unset(_CATKIN_CURRENT_PACKAGE)
	10	Index: ros-catkin/cmake/all.cmake
	11	===================================================================
	12	--- ros-catkin.orig/cmake/all.cmake
	13	+++ ros-catkin/cmake/all.cmake
	14	@@ -174,6 +174,17 @@ unset(_CATKIN_CURRENT_PACKAGE)
15	15	configure_shared_library_build_settings()
16	16
17	17	# set global install destinations

29	29	set(CATKIN_GLOBAL_BIN_DESTINATION bin)
30	30	set(CATKIN_GLOBAL_ETC_DESTINATION etc)
31	31	set(CATKIN_GLOBAL_INCLUDE_DESTINATION include)
32		@@ -180,6 +191,7 @@ set(CATKIN_GLOBAL_LIB_DESTINATION lib)
	32	@@ -181,6 +192,7 @@ set(CATKIN_GLOBAL_LIB_DESTINATION lib)
33	33	set(CATKIN_GLOBAL_LIBEXEC_DESTINATION lib)
34	34	set(CATKIN_GLOBAL_PYTHON_DESTINATION ${PYTHON_INSTALL_DIR})
35	35	set(CATKIN_GLOBAL_SHARE_DESTINATION share)

37	37
38	38	# undefine CATKIN_ENV since it might be set in the cache from a previous build
39	39	set(CATKIN_ENV "" CACHE INTERNAL "catkin environment" FORCE)
40		diff --git a/cmake/catkin_package.cmake b/cmake/catkin_package.cmake
41		index fb6b01a..d0bfb54 100644
42		--- a/cmake/catkin_package.cmake
43		+++ b/cmake/catkin_package.cmake
	40	Index: ros-catkin/cmake/catkin_package.cmake
	41	===================================================================
	42	--- ros-catkin.orig/cmake/catkin_package.cmake
	43	+++ ros-catkin/cmake/catkin_package.cmake
44	44	@@ -321,12 +321,12 @@ function(_catkin_package)
45	45
46	46	if(NOT PROJECT_SKIP_PKG_CONFIG_GENERATION)

+8

-8

debian/patches/0007-Don-t-export-development-path-to-release-package.patch less more

6	6	cmake/templates/pkgConfig.cmake.in \| 15 ++++-----------
7	7	2 files changed, 12 insertions(+), 11 deletions(-)
8	8
9		diff --git a/cmake/catkin_package.cmake b/cmake/catkin_package.cmake
10		index d0bfb54..7267b88 100644
11		--- a/cmake/catkin_package.cmake
12		+++ b/cmake/catkin_package.cmake
	9	Index: ros-catkin/cmake/catkin_package.cmake
	10	===================================================================
	11	--- ros-catkin.orig/cmake/catkin_package.cmake
	12	+++ ros-catkin/cmake/catkin_package.cmake
13	13	@@ -284,6 +284,10 @@ function(_catkin_package)
14	14	# used in the cmake extra files
15	15	set(DEVELSPACE TRUE)

32	32
33	33	set(PROJECT_SPACE_DIR ${CMAKE_INSTALL_PREFIX})
34	34	set(PKG_INCLUDE_PREFIX ${PROJECT_SPACE_DIR})
35		diff --git a/cmake/templates/pkgConfig.cmake.in b/cmake/templates/pkgConfig.cmake.in
36		index 9c0e46d..76f41cf 100644
37		--- a/cmake/templates/pkgConfig.cmake.in
38		+++ b/cmake/templates/pkgConfig.cmake.in
	35	Index: ros-catkin/cmake/templates/pkgConfig.cmake.in
	36	===================================================================
	37	--- ros-catkin.orig/cmake/templates/pkgConfig.cmake.in
	38	+++ ros-catkin/cmake/templates/pkgConfig.cmake.in
39	39	@@ -66,17 +66,10 @@ endif()
40	40	set(@PROJECT_NAME@_CONFIG_INCLUDED TRUE)
41	41

+5

-5

debian/patches/0009-Don-t-add-usr-include-as-include-dir.patch less more

5	5	cmake/templates/pkgConfig.cmake.in \| 2 ++
6	6	1 file changed, 2 insertions(+)
7	7
8		diff --git a/cmake/templates/pkgConfig.cmake.in b/cmake/templates/pkgConfig.cmake.in
9		index 76f41cf..6d4a2c6 100644
10		--- a/cmake/templates/pkgConfig.cmake.in
11		+++ b/cmake/templates/pkgConfig.cmake.in
12		@@ -105,7 +105,9 @@ if(NOT "@PROJECT_CMAKE_CONFIG_INCLUDE_DIRS@ " STREQUAL " ")
	8	Index: ros-catkin/cmake/templates/pkgConfig.cmake.in
	9	===================================================================
	10	--- ros-catkin.orig/cmake/templates/pkgConfig.cmake.in
	11	+++ ros-catkin/cmake/templates/pkgConfig.cmake.in
	12	@@ -105,7 +105,9 @@ if(NOT "@PROJECT_CMAKE_CONFIG_INCLUDE_DI
13	13	else()
14	14	message(FATAL_ERROR "Project '@PROJECT_NAME@' specifies '${idir}' as an include dir, which is not found. It does neither exist as an absolute directory nor in '@PKG_INCLUDE_PREFIX@/${idir}'. ${_report}")
15	15	endif()

+5

-5

debian/patches/0009-Don-t-generate-env-files.patch less more

5	5	cmake/all.cmake \| 1 +
6	6	1 file changed, 1 insertion(+)
7	7
8		diff --git a/cmake/all.cmake b/cmake/all.cmake
9		index 49708e6..37c5ccd 100644
10		--- a/cmake/all.cmake
11		+++ b/cmake/all.cmake
12		@@ -183,6 +183,7 @@ set(CATKIN_GLOBAL_LIB_DESTINATION "${CMAKE_INSTALL_LIBDIR}")
	8	Index: ros-catkin/cmake/all.cmake
	9	===================================================================
	10	--- ros-catkin.orig/cmake/all.cmake
	11	+++ ros-catkin/cmake/all.cmake
	12	@@ -184,6 +184,7 @@ set(CATKIN_GLOBAL_LIB_DESTINATION "${CMA
13	13	set(CATKIN_GLOBAL_LIBEXEC_DESTINATION lib)
14	14	set(CATKIN_GLOBAL_PYTHON_DESTINATION ${PYTHON_INSTALL_DIR})
15	15	set(CATKIN_GLOBAL_SHARE_DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}")

+5

-5

debian/patches/0010-Don-t-generate-environment-scripts-when-installing-i.patch less more

6	6	cmake/all.cmake \| 2 +-
7	7	1 file changed, 1 insertion(+), 1 deletion(-)
8	8
9		diff --git a/cmake/all.cmake b/cmake/all.cmake
10		index 37c5ccd..b0e8392 100644
11		--- a/cmake/all.cmake
12		+++ b/cmake/all.cmake
13		@@ -77,7 +77,7 @@ endif()
	9	Index: ros-catkin/cmake/all.cmake
	10	===================================================================
	11	--- ros-catkin.orig/cmake/all.cmake
	12	+++ ros-catkin/cmake/all.cmake
	13	@@ -78,7 +78,7 @@ endif()
14	14	# set CATKIN_INSTALL_INTO_PREFIX_ROOT based on CATKIN_BUILD_BINARY_PACKAGE
15	15	# if not defined already
16	16	if(NOT DEFINED CATKIN_INSTALL_INTO_PREFIX_ROOT)

+5

-5

debian/patches/0013-Don-t-guess-include-dir-if-we-install-into-usr-inclu.patch less more

7	7	cmake/templates/pkgConfig.cmake.in \| 3 +++
8	8	1 file changed, 3 insertions(+)
9	9
10		diff --git a/cmake/templates/pkgConfig.cmake.in b/cmake/templates/pkgConfig.cmake.in
11		index 6d4a2c6..1fd8252 100644
12		--- a/cmake/templates/pkgConfig.cmake.in
13		+++ b/cmake/templates/pkgConfig.cmake.in
14		@@ -97,6 +97,9 @@ if(NOT "@PROJECT_CMAKE_CONFIG_INCLUDE_DIRS@ " STREQUAL " ")
	10	Index: ros-catkin/cmake/templates/pkgConfig.cmake.in
	11	===================================================================
	12	--- ros-catkin.orig/cmake/templates/pkgConfig.cmake.in
	13	+++ ros-catkin/cmake/templates/pkgConfig.cmake.in
	14	@@ -97,6 +97,9 @@ if(NOT "@PROJECT_CMAKE_CONFIG_INCLUDE_DI
15	15	foreach(idir ${_include_dirs})
16	16	if(IS_ABSOLUTE ${idir} AND IS_DIRECTORY ${idir})
17	17	set(include ${idir})

+5

-5

debian/patches/0015-include-threads-library.patch less more

5	5	cmake/all.cmake \| 2 +-
6	6	1 file changed, 1 insertion(+), 1 deletion(-)
7	7
8		diff --git a/cmake/all.cmake b/cmake/all.cmake
9		index b0e8392..2f54515 100644
10		--- a/cmake/all.cmake
11		+++ b/cmake/all.cmake
12		@@ -158,7 +158,7 @@ foreach(filename
	8	Index: ros-catkin/cmake/all.cmake
	9	===================================================================
	10	--- ros-catkin.orig/cmake/all.cmake
	11	+++ ros-catkin/cmake/all.cmake
	12	@@ -159,7 +159,7 @@ foreach(filename
13	13	tools/libraries
14	14	tools/rt
15	15