Rebase patches

diff --git a/debian/patches/0001-Fix-PCL_ROOT-path.patch b/debian/patches/0001-Fix-PCL_ROOT-path.patch
index 5e317db97099943b971e74fc554993f1bfecc472..77f56b9ae8df11a19f8c104229ba2180b04d4176 100644 (file)
--- a/debian/patches/0001-Fix-PCL_ROOT-path.patch
+++ b/debian/patches/0001-Fix-PCL_ROOT-path.patch
@@ -7,11 +7,11 @@ Subject: Fix PCL_ROOT path
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
-index 9f78fcf..91e6ebd 100644
+index a1283a8..0941d0f 100644
 --- a/PCLConfig.cmake.in
 +++ b/PCLConfig.cmake.in
-@@ -398,7 +398,7 @@ if(WIN32 AND NOT MINGW)
-   get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
+@@ -389,7 +389,7 @@ if(WIN32 AND NOT MINGW)
+   endif()
  else()
  # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y
 -  get_filename_component(PCL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)

diff --git a/debian/patches/0002-Link-against-atomic-if-needed-found-on-armel.patch b/debian/patches/0002-Link-against-atomic-if-needed-found-on-armel.patch
index 2193a97f0d75d71b110b4fdf77c9afd58789bb15..e68ee1ad82357a53ae274ed5e74d67bb095b9b25 100644 (file)
--- a/debian/patches/0002-Link-against-atomic-if-needed-found-on-armel.patch
+++ b/debian/patches/0002-Link-against-atomic-if-needed-found-on-armel.patch
@@ -8,7 +8,7 @@ Subject: Link against atomic if needed (found on armel)
  2 files changed, 15 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index aa59b76..8ae6cc9 100644
+index 63b38df..e44ec3e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -60,6 +60,20 @@ elseif(MINGW)
@@ -33,10 +33,10 @@ index aa59b76..8ae6cc9 100644
  # This will be used further down the road to check if the user explicitly provided CXX flags
  if(CMAKE_COMPILER_IS_MSVC)
 diff --git a/cmake/pcl_targets.cmake b/cmake/pcl_targets.cmake
-index 9dc6956..1a9947c 100644
+index 91f2404..bf11eeb 100644
 --- a/cmake/pcl_targets.cmake
 +++ b/cmake/pcl_targets.cmake
-@@ -229,7 +229,7 @@ function(PCL_ADD_LIBRARY _name)
+@@ -230,7 +230,7 @@ function(PCL_ADD_LIBRARY _name)
    endif()
  
    if((UNIX AND NOT ANDROID) OR MINGW)