Refresh patches.

6 files changed, 15 insertions, 16 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 82a72911..4c6e8d5d 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,10 +78,10 @@ index f99b164..ae302dc 100644
  endif()
  
 diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
-index 5508cbc..1778290 100644
+index b558d4c..472993b 100644
 --- a/src/python/CMakeLists.txt
 +++ b/src/python/CMakeLists.txt
-@@ -256,36 +256,7 @@ if(PYTHONINTERP_FOUND)
+@@ -277,36 +277,7 @@ endif(CGAL_FOUND)
  
        add_gudhi_py_test(test_bottleneck_distance)
  
diff --git a/debian/patches/0002-Use-system-MathJax.patch b/debian/patches/0002-Use-system-MathJax.patch
index fd6288ba..b327c3cf 100644
--- a/debian/patches/0002-Use-system-MathJax.patch
+++ b/debian/patches/0002-Use-system-MathJax.patch
@@ -7,7 +7,7 @@ Subject: Use system MathJax.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/Doxyfile.in b/src/Doxyfile.in
-index 5777549..de452c9 100644
+index ec55188..e90d2fe 100644
 --- a/src/Doxyfile.in
 +++ b/src/Doxyfile.in
 @@ -1440,7 +1440,7 @@ MATHJAX_FORMAT         = HTML-CSS
diff --git a/debian/patches/0004-Offline-header-for-docs.patch b/debian/patches/0004-Offline-header-for-docs.patch
index 232d7e53..70678963 100644
--- a/debian/patches/0004-Offline-header-for-docs.patch
+++ b/debian/patches/0004-Offline-header-for-docs.patch
@@ -7,7 +7,7 @@ Subject: Offline header for docs.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/Doxyfile.in b/src/Doxyfile.in
-index de452c9..98d8b96 100644
+index e90d2fe..f82baba 100644
 --- a/src/Doxyfile.in
 +++ b/src/Doxyfile.in
 @@ -1045,7 +1045,7 @@ HTML_FILE_EXTENSION    = .html
diff --git a/debian/patches/0005-Disable-Sphinx.patch b/debian/patches/0005-Disable-Sphinx.patch
index e3f42382..69b76bc8 100644
--- a/debian/patches/0005-Disable-Sphinx.patch
+++ b/debian/patches/0005-Disable-Sphinx.patch
@@ -1,5 +1,5 @@
 From: Gard Spreemann <gspr@nonempty.org>
-Date: Wed, 25 Sep 2019 15:28:15 +0200
+Date: Tue, 21 Jan 2020 10:36:48 +0100
 Subject: Disable Sphinx.
 
 ---
@@ -7,7 +7,7 @@ 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 360a230..bffd2ee 100644
+index 24a3415..38484ba 100644
 --- a/src/cmake/modules/GUDHI_third_party_libraries.cmake
 +++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake
 @@ -124,7 +124,6 @@ if( PYTHONINTERP_FOUND )
@@ -15,6 +15,6 @@ index 360a230..bffd2ee 100644
    find_python_module("numpy")
    find_python_module("scipy")
 -  find_python_module("sphinx")
+   find_python_module("sklearn")
+   find_python_module("ot")
  endif()
- 
- if(NOT GUDHI_PYTHON_PATH)
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 67999267..1e4310ee 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 1778290..a999cea 100644
+index 472993b..1dd3721 100644
 --- a/src/python/CMakeLists.txt
 +++ b/src/python/CMakeLists.txt
-@@ -208,7 +208,7 @@ if(PYTHONINTERP_FOUND)
+@@ -230,7 +230,7 @@ endif(CGAL_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/0007-Move-towards-reproducible-builds.patch b/debian/patches/0007-Move-towards-reproducible-builds.patch
index 4c487bab..7e2f01db 100644
--- a/debian/patches/0007-Move-towards-reproducible-builds.patch
+++ b/debian/patches/0007-Move-towards-reproducible-builds.patch
@@ -1,16 +1,15 @@
 From: Gard Spreemann <gspr@nonempty.org>
-Date: Tue, 10 Dec 2019 14:31:47 +0100
+Date: Tue, 21 Jan 2020 10:39:23 +0100
 Subject: Move towards reproducible builds.
 
-This probably does not take us all the way there, and probably breaks
-doctest, but since we're not doing sphinx stuff yet anyway, that is ok
-for now.
+This does not take us all the way there, and probably breaks doctest,
+but since we're not doing Sphinx stuff yet anyway, that is ok for now.
 ---
  src/python/gudhi/__init__.py.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/python/gudhi/__init__.py.in b/src/python/gudhi/__init__.py.in
-index 28bab0e..e22dde4 100644
+index 79e12fb..991745a 100644
 --- a/src/python/gudhi/__init__.py.in
 +++ b/src/python/gudhi/__init__.py.in
 @@ -15,7 +15,7 @@ __copyright__ = "Copyright (C) 2016 Inria"
@@ -21,4 +20,4 @@ index 28bab0e..e22dde4 100644
 +__root_source_dir__ = "."
  __debug_info__ = @GUDHI_PYTHON_DEBUG_INFO@
  
- from sys import exc_info
+ __all__ = [@GUDHI_PYTHON_MODULES@ @GUDHI_PYTHON_MODULES_EXTRA@]