Rebase patched and drop 0008-Don-t-try-to-install-Hera.patch.

5 files changed, 8 insertions, 31 deletions

diff --git a/debian/patches/0001-Disable-tests-that-use-DFSG-deleted-data-files.patch b/debian/patches/0001-Disable-tests-that-use-DFSG-deleted-data-files.patch
index f574ed63..4b4f24f3 100644
--- a/debian/patches/0001-Disable-tests-that-use-DFSG-deleted-data-files.patch
+++ b/debian/patches/0001-Disable-tests-that-use-DFSG-deleted-data-files.patch
@@ -78,12 +78,12 @@ index a0aabee..5c572f8 100644
  endif()
  
 diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
-index ab08cd6..1a2f18b 100644
+index 4f26481..99b648b 100644
 --- a/src/python/CMakeLists.txt
 +++ b/src/python/CMakeLists.txt
-@@ -355,36 +355,7 @@ if(PYTHONINTERP_FOUND)
- 
-       add_gudhi_py_test(test_bottleneck_distance)
+@@ -381,36 +381,7 @@ if(PYTHONINTERP_FOUND)
+         add_gudhi_py_test(test_bottleneck_distance)
+       endif()
  
 -      # Cover complex
 -      file(COPY ${CMAKE_SOURCE_DIR}/data/points/human.off DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
diff --git a/debian/patches/0005-Disable-Sphinx.patch b/debian/patches/0005-Disable-Sphinx.patch
index d741bb9f..0df79e58 100644
--- a/debian/patches/0005-Disable-Sphinx.patch
+++ b/debian/patches/0005-Disable-Sphinx.patch
@@ -7,10 +7,10 @@ Subject: Disable Sphinx.
  1 file changed, 1 deletion(-)
 
 diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake
-index 0abe66b..7a418e4 100644
+index a56a275..11b5b20 100644
 --- a/src/cmake/modules/GUDHI_third_party_libraries.cmake
 +++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake
-@@ -175,7 +175,6 @@ if( PYTHONINTERP_FOUND )
+@@ -178,7 +178,6 @@ if( PYTHONINTERP_FOUND )
    find_python_module("matplotlib")
    find_python_module("numpy")
    find_python_module("scipy")
diff --git a/debian/patches/0006-Install-Python-module-in-correct-location.patch b/debian/patches/0006-Install-Python-module-in-correct-location.patch
index e8c23fde..0b4a8f64 100644
--- a/debian/patches/0006-Install-Python-module-in-correct-location.patch
+++ b/debian/patches/0006-Install-Python-module-in-correct-location.patch
@@ -7,10 +7,10 @@ Subject: Install Python module in correct location.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
-index 1a2f18b..94ef78b 100644
+index 99b648b..162bd27 100644
 --- a/src/python/CMakeLists.txt
 +++ b/src/python/CMakeLists.txt
-@@ -243,7 +243,7 @@ if(PYTHONINTERP_FOUND)
+@@ -267,7 +267,7 @@ if(PYTHONINTERP_FOUND)
      add_custom_target(python ALL DEPENDS gudhi.so
                        COMMENT "Do not forget to add ${CMAKE_CURRENT_BINARY_DIR}/ to your PYTHONPATH before using examples or tests")
  
diff --git a/debian/patches/0008-Don-t-try-to-install-Hera.patch b/debian/patches/0008-Don-t-try-to-install-Hera.patch
deleted file mode 100644
index c498e81a..00000000
--- a/debian/patches/0008-Don-t-try-to-install-Hera.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Gard Spreemann <gspr@nonempty.org>
-Date: Thu, 4 Jun 2020 14:36:26 +0200
-Subject: Don't try to install Hera.
-
-We use the system version.
----
- src/cmake/modules/GUDHI_user_version_target.cmake | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/cmake/modules/GUDHI_user_version_target.cmake b/src/cmake/modules/GUDHI_user_version_target.cmake
-index 9cf648e..321f49d 100644
---- a/src/cmake/modules/GUDHI_user_version_target.cmake
-+++ b/src/cmake/modules/GUDHI_user_version_target.cmake
-@@ -58,8 +58,6 @@ add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E
- add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E
-                    copy_directory ${CMAKE_SOURCE_DIR}/src/GudhUI ${GUDHI_USER_VERSION_DIR}/GudhUI)
- 
--add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E
--                   copy_directory ${CMAKE_SOURCE_DIR}/ext/hera/wasserstein/include ${GUDHI_USER_VERSION_DIR}/ext/hera/wasserstein/include)
- 
- set(GUDHI_DIRECTORIES "doc;example;concept;utilities")
- 
diff --git a/debian/patches/series b/debian/patches/series
index 4d8eed77..adeb35f7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
 0005-Disable-Sphinx.patch
 0006-Install-Python-module-in-correct-location.patch
 0007-Move-towards-reproducible-builds.patch
-0008-Don-t-try-to-install-Hera.patch