From 1ff14a8264cc6e4dd9f10d3141b3901052e9a1d4 Mon Sep 17 00:00:00 2001 From: Gard Spreemann Date: Thu, 23 Dec 2021 16:55:02 +0100 Subject: Renumber patches --- debian/patches/0003-Offline-header-for-docs.patch | 21 ++++++++++++++++++++ debian/patches/0004-Disable-Sphinx.patch | 20 +++++++++++++++++++ debian/patches/0004-Offline-header-for-docs.patch | 21 -------------------- debian/patches/0005-Disable-Sphinx.patch | 20 ------------------- ...Install-Python-module-in-correct-location.patch | 21 ++++++++++++++++++++ ...Install-Python-module-in-correct-location.patch | 21 -------------------- .../0006-Move-towards-reproducible-builds.patch | 23 ++++++++++++++++++++++ .../0007-Move-towards-reproducible-builds.patch | 23 ---------------------- debian/patches/series | 8 ++++---- 9 files changed, 89 insertions(+), 89 deletions(-) create mode 100644 debian/patches/0003-Offline-header-for-docs.patch create mode 100644 debian/patches/0004-Disable-Sphinx.patch delete mode 100644 debian/patches/0004-Offline-header-for-docs.patch delete mode 100644 debian/patches/0005-Disable-Sphinx.patch create mode 100644 debian/patches/0005-Install-Python-module-in-correct-location.patch delete mode 100644 debian/patches/0006-Install-Python-module-in-correct-location.patch create mode 100644 debian/patches/0006-Move-towards-reproducible-builds.patch delete mode 100644 debian/patches/0007-Move-towards-reproducible-builds.patch diff --git a/debian/patches/0003-Offline-header-for-docs.patch b/debian/patches/0003-Offline-header-for-docs.patch new file mode 100644 index 00000000..b6dba1ab --- /dev/null +++ b/debian/patches/0003-Offline-header-for-docs.patch @@ -0,0 +1,21 @@ +From: Gard Spreemann +Date: Wed, 25 Sep 2019 15:19:14 +0200 +Subject: Offline header for docs. + +--- + src/Doxyfile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Doxyfile.in b/src/Doxyfile.in +index 52b8cbe..f516ef7 100644 +--- a/src/Doxyfile.in ++++ b/src/Doxyfile.in +@@ -1046,7 +1046,7 @@ HTML_FILE_EXTENSION = .html + # of the possible markers and block names see the documentation. + # This tag requires that the tag GENERATE_HTML is set to YES. + +-HTML_HEADER = doc/common/header.html ++HTML_HEADER = doc/common/offline_header.html + + # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each + # generated HTML page. If the tag is left blank doxygen will generate a standard diff --git a/debian/patches/0004-Disable-Sphinx.patch b/debian/patches/0004-Disable-Sphinx.patch new file mode 100644 index 00000000..2aee22ff --- /dev/null +++ b/debian/patches/0004-Disable-Sphinx.patch @@ -0,0 +1,20 @@ +From: Gard Spreemann +Date: Tue, 21 Jan 2020 10:36:48 +0100 +Subject: Disable Sphinx. + +--- + src/cmake/modules/GUDHI_third_party_libraries.cmake | 1 - + 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 e156687..aa1c4bb 100644 +--- a/src/cmake/modules/GUDHI_third_party_libraries.cmake ++++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake +@@ -147,7 +147,6 @@ if( PYTHONINTERP_FOUND ) + find_python_module("matplotlib") + find_python_module("numpy") + find_python_module("scipy") +- find_python_module("sphinx") + find_python_module("sklearn") + find_python_module("ot") + find_python_module("pybind11") diff --git a/debian/patches/0004-Offline-header-for-docs.patch b/debian/patches/0004-Offline-header-for-docs.patch deleted file mode 100644 index b6dba1ab..00000000 --- a/debian/patches/0004-Offline-header-for-docs.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Gard Spreemann -Date: Wed, 25 Sep 2019 15:19:14 +0200 -Subject: Offline header for docs. - ---- - src/Doxyfile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Doxyfile.in b/src/Doxyfile.in -index 52b8cbe..f516ef7 100644 ---- a/src/Doxyfile.in -+++ b/src/Doxyfile.in -@@ -1046,7 +1046,7 @@ HTML_FILE_EXTENSION = .html - # of the possible markers and block names see the documentation. - # This tag requires that the tag GENERATE_HTML is set to YES. - --HTML_HEADER = doc/common/header.html -+HTML_HEADER = doc/common/offline_header.html - - # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each - # generated HTML page. If the tag is left blank doxygen will generate a standard diff --git a/debian/patches/0005-Disable-Sphinx.patch b/debian/patches/0005-Disable-Sphinx.patch deleted file mode 100644 index 2aee22ff..00000000 --- a/debian/patches/0005-Disable-Sphinx.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Gard Spreemann -Date: Tue, 21 Jan 2020 10:36:48 +0100 -Subject: Disable Sphinx. - ---- - src/cmake/modules/GUDHI_third_party_libraries.cmake | 1 - - 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 e156687..aa1c4bb 100644 ---- a/src/cmake/modules/GUDHI_third_party_libraries.cmake -+++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake -@@ -147,7 +147,6 @@ if( PYTHONINTERP_FOUND ) - find_python_module("matplotlib") - find_python_module("numpy") - find_python_module("scipy") -- find_python_module("sphinx") - find_python_module("sklearn") - find_python_module("ot") - find_python_module("pybind11") diff --git a/debian/patches/0005-Install-Python-module-in-correct-location.patch b/debian/patches/0005-Install-Python-module-in-correct-location.patch new file mode 100644 index 00000000..a395cdd8 --- /dev/null +++ b/debian/patches/0005-Install-Python-module-in-correct-location.patch @@ -0,0 +1,21 @@ +From: Gard Spreemann +Date: Thu, 26 Sep 2019 13:26:22 +0200 +Subject: Install Python module in correct location. + +--- + src/python/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt +index a45e13a..4d56f58 100644 +--- a/src/python/CMakeLists.txt ++++ b/src/python/CMakeLists.txt +@@ -274,7 +274,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") + +- install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/setup.py install)") ++ install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} setup.py install --root=${CMAKE_SOURCE_DIR}/debian/tmp --single-version-externally-managed --install-layout=deb WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})") + + # Documentation generation is available through sphinx - requires all modules + # Make it first as sphinx test is by far the longest test which is nice when testing in parallel diff --git a/debian/patches/0006-Install-Python-module-in-correct-location.patch b/debian/patches/0006-Install-Python-module-in-correct-location.patch deleted file mode 100644 index a395cdd8..00000000 --- a/debian/patches/0006-Install-Python-module-in-correct-location.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Gard Spreemann -Date: Thu, 26 Sep 2019 13:26:22 +0200 -Subject: Install Python module in correct location. - ---- - src/python/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt -index a45e13a..4d56f58 100644 ---- a/src/python/CMakeLists.txt -+++ b/src/python/CMakeLists.txt -@@ -274,7 +274,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") - -- install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/setup.py install)") -+ install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} setup.py install --root=${CMAKE_SOURCE_DIR}/debian/tmp --single-version-externally-managed --install-layout=deb WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})") - - # Documentation generation is available through sphinx - requires all modules - # Make it first as sphinx test is by far the longest test which is nice when testing in parallel diff --git a/debian/patches/0006-Move-towards-reproducible-builds.patch b/debian/patches/0006-Move-towards-reproducible-builds.patch new file mode 100644 index 00000000..7d6ae95d --- /dev/null +++ b/debian/patches/0006-Move-towards-reproducible-builds.patch @@ -0,0 +1,23 @@ +From: Gard Spreemann +Date: Tue, 21 Jan 2020 10:39:23 +0100 +Subject: Move towards reproducible builds. + +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 3043201..ef6389e 100644 +--- a/src/python/gudhi/__init__.py.in ++++ b/src/python/gudhi/__init__.py.in +@@ -15,7 +15,7 @@ __copyright__ = "Copyright (C) 2016 Inria" + __license__ = "https://gudhi.inria.fr/licensing/" + __version__ = "@GUDHI_VERSION@" + # This variable is used by doctest to find files +-__root_source_dir__ = "@CMAKE_SOURCE_DIR@" ++__root_source_dir__ = "." + __debug_info__ = @GUDHI_PYTHON_DEBUG_INFO@ + + __all__ = [@GUDHI_PYTHON_MODULES@ @GUDHI_PYTHON_MODULES_EXTRA@] diff --git a/debian/patches/0007-Move-towards-reproducible-builds.patch b/debian/patches/0007-Move-towards-reproducible-builds.patch deleted file mode 100644 index 7d6ae95d..00000000 --- a/debian/patches/0007-Move-towards-reproducible-builds.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Gard Spreemann -Date: Tue, 21 Jan 2020 10:39:23 +0100 -Subject: Move towards reproducible builds. - -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 3043201..ef6389e 100644 ---- a/src/python/gudhi/__init__.py.in -+++ b/src/python/gudhi/__init__.py.in -@@ -15,7 +15,7 @@ __copyright__ = "Copyright (C) 2016 Inria" - __license__ = "https://gudhi.inria.fr/licensing/" - __version__ = "@GUDHI_VERSION@" - # This variable is used by doctest to find files --__root_source_dir__ = "@CMAKE_SOURCE_DIR@" -+__root_source_dir__ = "." - __debug_info__ = @GUDHI_PYTHON_DEBUG_INFO@ - - __all__ = [@GUDHI_PYTHON_MODULES@ @GUDHI_PYTHON_MODULES_EXTRA@] diff --git a/debian/patches/series b/debian/patches/series index 5b7f187e..7167006d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,7 @@ 0001-Disable-tests-that-use-DFSG-deleted-data-files.patch 0002-Use-system-MathJax.patch -0004-Offline-header-for-docs.patch -0005-Disable-Sphinx.patch -0006-Install-Python-module-in-correct-location.patch -0007-Move-towards-reproducible-builds.patch +0003-Offline-header-for-docs.patch +0004-Disable-Sphinx.patch +0005-Install-Python-module-in-correct-location.patch +0006-Move-towards-reproducible-builds.patch 0007-Turn-positional-argument-into-keyword-argument.patch -- cgit v1.2.3