[ros-catkin] 02/08: Update patches

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke pushed a commit to branch master
in repository ros-catkin.

commit b2280d189bfd29c61ad6666b01c28664fd76b062
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Jun 23 14:40:31 2017 +0200

    Update patches
---
 ...EFAULT_PATH-and-NO_CMAKE_FIND_ROOT_PATH-f.patch |  2 +-
 ...e-GNUInstallDirs-when-installing-into-usr.patch |  2 +-
 ...xport-development-path-to-release-package.patch |  2 +-
 ...8-Add-targets-for-gtest-libraries-locally.patch | 26 ----------------------
 debian/patches/series                              |  1 -
 5 files changed, 3 insertions(+), 30 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 3245564..cacf9e9 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
@@ -8,7 +8,7 @@ Subject: Remove NO_DEFAULT_PATH and NO_CMAKE_FIND_ROOT_PATH from find_package
  2 files changed, 5 insertions(+), 10 deletions(-)
 
 diff --git a/cmake/catkinConfig.cmake.in b/cmake/catkinConfig.cmake.in
-index 8afb6df..7f2ce48 100644
+index c6ee2b3..0805a9d 100644
 --- a/cmake/catkinConfig.cmake.in
 +++ b/cmake/catkinConfig.cmake.in
 @@ -73,22 +73,18 @@ if(catkin_FIND_COMPONENTS)
diff --git a/debian/patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch b/debian/patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch
index 6ef51f0..02b7144 100644
--- a/debian/patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch
+++ b/debian/patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch
@@ -39,7 +39,7 @@ index 6910906..ce1918f 100644
  # undefine CATKIN_ENV since it might be set in the cache from a previous build
  set(CATKIN_ENV "" CACHE INTERNAL "catkin environment" FORCE)
 diff --git a/cmake/catkin_package.cmake b/cmake/catkin_package.cmake
-index ee47981..f03c38d 100644
+index b43f73d..18fffac 100644
 --- a/cmake/catkin_package.cmake
 +++ b/cmake/catkin_package.cmake
 @@ -320,12 +320,12 @@ function(_catkin_package)
diff --git a/debian/patches/0007-Don-t-export-development-path-to-release-package.patch b/debian/patches/0007-Don-t-export-development-path-to-release-package.patch
index 83f791c..afa3155 100644
--- a/debian/patches/0007-Don-t-export-development-path-to-release-package.patch
+++ b/debian/patches/0007-Don-t-export-development-path-to-release-package.patch
@@ -8,7 +8,7 @@ Subject: Don't export development path to release package
  2 files changed, 12 insertions(+), 11 deletions(-)
 
 diff --git a/cmake/catkin_package.cmake b/cmake/catkin_package.cmake
-index f03c38d..5a28669 100644
+index 18fffac..afcc3c1 100644
 --- a/cmake/catkin_package.cmake
 +++ b/cmake/catkin_package.cmake
 @@ -283,6 +283,10 @@ function(_catkin_package)
diff --git a/debian/patches/0008-Add-targets-for-gtest-libraries-locally.patch b/debian/patches/0008-Add-targets-for-gtest-libraries-locally.patch
deleted file mode 100644
index f5ef3b9..0000000
--- a/debian/patches/0008-Add-targets-for-gtest-libraries-locally.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Sun, 13 Nov 2016 22:41:28 +0100
-Subject: Add targets for gtest libraries locally
-
-The CMakeLists.txt of gtest adds install targets for the gtest libraries
-and includes. Instead of doing add_subdirectory(), this adds the needed
-libraries directly.
----
- cmake/test/gtest.cmake | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/cmake/test/gtest.cmake b/cmake/test/gtest.cmake
-index f9c5ff5..e149dc4 100644
---- a/cmake/test/gtest.cmake
-+++ b/cmake/test/gtest.cmake
-@@ -117,7 +117,9 @@ if(NOT GTEST_FOUND)
-       get_filename_component(_CATKIN_GTEST_BASE_DIR ${_CATKIN_GTEST_SOURCE_DIR} PATH)
-       # add CMakeLists.txt from gtest dir
-       set(_CATKIN_GTEST_BINARY_DIR ${CMAKE_BINARY_DIR}/gtest)
--      add_subdirectory(${_CATKIN_GTEST_BASE_DIR} ${_CATKIN_GTEST_BINARY_DIR})
-+      add_library(gtest SHARED ${_CATKIN_GTEST_SOURCE_DIR}/gtest-all.cc)
-+      target_include_directories(gtest PRIVATE ${_CATKIN_GTEST_BASE_DIR})
-+      add_library(gtest_main SHARED ${_CATKIN_GTEST_SOURCE_DIR}/gtest_main.cc)
-       # mark gtest targets with EXCLUDE_FROM_ALL to only build when tests are built which depend on them
-       set_target_properties(gtest gtest_main PROPERTIES EXCLUDE_FROM_ALL 1)
-       get_filename_component(_CATKIN_GTEST_INCLUDE_DIR ${_CATKIN_GTEST_INCLUDE} PATH)
diff --git a/debian/patches/series b/debian/patches/series
index 38dfcd3..3844695 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,5 +5,4 @@
 0005-Use-profile.d-in-usr-in-_setup_util.py.patch
 0006-use-GNUInstallDirs-when-installing-into-usr.patch
 0007-Don-t-export-development-path-to-release-package.patch
-0008-Add-targets-for-gtest-libraries-locally.patch
 0009-Don-t-generate-env-files.patch

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