From 2ad98abbd8e3a4265ab0a5f4403578362a8bf9ce Mon Sep 17 00:00:00 2001
From: Gard Spreemann <gspreemann@gmail.com>
Date: Mon, 10 Sep 2018 17:12:29 +0200
Subject: Expand patch to remove more tests relying on DFSG-deleted data.

---
 ...le-tests-that-use-DFSG-deleted-data-files.patch | 52 +++++++++++++++++++---
 ...-Force-linking-of-Python-module-with-CGAL.patch |  2 +-
 2 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/debian/patches/0002-Disable-tests-that-use-DFSG-deleted-data-files.patch b/debian/patches/0002-Disable-tests-that-use-DFSG-deleted-data-files.patch
index 6dff318d..e59a4f8b 100644
--- a/debian/patches/0002-Disable-tests-that-use-DFSG-deleted-data-files.patch
+++ b/debian/patches/0002-Disable-tests-that-use-DFSG-deleted-data-files.patch
@@ -3,12 +3,54 @@ Date: Mon, 10 Sep 2018 05:17:29 +0200
 Subject: Disable tests that use DFSG-deleted data files.
 
 ---
- example/Nerve_GIC/CMakeLists.txt             | 6 ------
- example/Persistent_cohomology/CMakeLists.txt | 4 ----
- example/Simplex_tree/CMakeLists.txt          | 2 --
- utilities/Nerve_GIC/CMakeLists.txt           | 8 --------
- 4 files changed, 20 deletions(-)
+ cython/CMakeLists.txt                        | 30 ----------------------------
+ example/Nerve_GIC/CMakeLists.txt             |  6 ------
+ example/Persistent_cohomology/CMakeLists.txt |  4 ----
+ example/Simplex_tree/CMakeLists.txt          |  2 --
+ utilities/Nerve_GIC/CMakeLists.txt           |  8 --------
+ 5 files changed, 50 deletions(-)
 
+diff --git a/cython/CMakeLists.txt b/cython/CMakeLists.txt
+index 829d53b..219b99e 100644
+--- a/cython/CMakeLists.txt
++++ b/cython/CMakeLists.txt
+@@ -265,36 +265,6 @@ if(CYTHON_FOUND)
+ 
+     add_gudhi_py_test(test_bottleneck_distance)
+ 
+-    # Cover complex
+-    file(COPY ${CMAKE_SOURCE_DIR}/data/points/human.off DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
+-    file(COPY ${CMAKE_SOURCE_DIR}/data/points/COIL_database/lucky_cat.off DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
+-    file(COPY ${CMAKE_SOURCE_DIR}/data/points/COIL_database/lucky_cat_PCA1 DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
+-    add_test(NAME cover_complex_nerve_example_py_test
+-             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-             COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
+-             ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/nerve_of_a_covering.py"
+-             -f human.off -c 2 -r 10 -g 0.3)
+-
+-    add_test(NAME cover_complex_coordinate_gic_example_py_test
+-             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-             COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
+-             ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/coordinate_graph_induced_complex.py"
+-             -f human.off -c 0 -v)
+-
+-    add_test(NAME cover_complex_functional_gic_example_py_test
+-             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-             COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
+-             ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/functional_graph_induced_complex.py"
+-             -o lucky_cat.off
+-             -f lucky_cat_PCA1 -v)
+-
+-    add_test(NAME cover_complex_voronoi_gic_example_py_test
+-             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-             COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
+-             ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/voronoi_graph_induced_complex.py"
+-             -f human.off -n 700 -v)
+-
+-    add_gudhi_py_test(test_cover_complex)
+   endif (NOT CGAL_VERSION VERSION_LESS 4.8.1)
+ 
+   if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.7.0)
 diff --git a/example/Nerve_GIC/CMakeLists.txt b/example/Nerve_GIC/CMakeLists.txt
 index fdecf86..f63e08e 100644
 --- a/example/Nerve_GIC/CMakeLists.txt
diff --git a/debian/patches/0005-Force-linking-of-Python-module-with-CGAL.patch b/debian/patches/0005-Force-linking-of-Python-module-with-CGAL.patch
index 52aa9737..d8ca0255 100644
--- a/debian/patches/0005-Force-linking-of-Python-module-with-CGAL.patch
+++ b/debian/patches/0005-Force-linking-of-Python-module-with-CGAL.patch
@@ -7,7 +7,7 @@ Subject: Force linking of Python module with CGAL.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/cython/CMakeLists.txt b/cython/CMakeLists.txt
-index 829d53b..b8004c5 100644
+index 219b99e..7b8e38f 100644
 --- a/cython/CMakeLists.txt
 +++ b/cython/CMakeLists.txt
 @@ -143,7 +143,7 @@ if(CYTHON_FOUND)
-- 
cgit v1.2.3