diff options
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | debian/libgudhi-doc.install | 2 | ||||
-rw-r--r-- | debian/patches/0005-Don-t-process-the-entire-source-tree-with-Doxygen.patch | 21 | ||||
-rw-r--r-- | debian/patches/series | 1 | ||||
-rwxr-xr-x | debian/rules | 24 |
5 files changed, 21 insertions, 33 deletions
diff --git a/debian/changelog b/debian/changelog index ad30eadf..389b2f22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,12 @@ gudhi (3.6.0+dfsg-1) unstable; urgency=medium * Drop some new DFSG-incompatible image files. * Refresh patches. * Remove cleanup of Miniball, no longer shipped upstream. + * Revamp d/rules in order to *actually* build the "user version", as + intended upstream. + - Drop doxygen patch now that we build correctly. + * Clean up documentation installation. - -- Gard Spreemann <gspr@nonempty.org> Wed, 17 Aug 2022 18:15:39 +0200 + -- Gard Spreemann <gspr@nonempty.org> Wed, 17 Aug 2022 21:47:20 +0200 gudhi (3.5.0+dfsg-3) unstable; urgency=medium diff --git a/debian/libgudhi-doc.install b/debian/libgudhi-doc.install index 01b42af4..bac48320 100644 --- a/debian/libgudhi-doc.install +++ b/debian/libgudhi-doc.install @@ -1 +1 @@ -build/userversion/html/* usr/share/doc/libgudhi-dev/html/ +build/userversion/build/html/* usr/share/doc/libgudhi-dev/html/ diff --git a/debian/patches/0005-Don-t-process-the-entire-source-tree-with-Doxygen.patch b/debian/patches/0005-Don-t-process-the-entire-source-tree-with-Doxygen.patch deleted file mode 100644 index 4e15991b..00000000 --- a/debian/patches/0005-Don-t-process-the-entire-source-tree-with-Doxygen.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Gard Spreemann <gspr@nonempty.org> -Date: Fri, 14 Jan 2022 19:28:15 +0100 -Subject: Don't process the entire source tree with Doxygen - ---- - src/Doxyfile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Doxyfile.in b/src/Doxyfile.in -index c938635..f5b3555 100644 ---- a/src/Doxyfile.in -+++ b/src/Doxyfile.in -@@ -778,7 +778,7 @@ WARN_LOGFILE = doxygen.log - # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING - # Note: If this tag is empty the current directory is searched. - --INPUT = @CMAKE_SOURCE_DIR@ -+INPUT = - - # This tag can be used to specify the character encoding of the source files - # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/debian/patches/series b/debian/patches/series index 5c95e702..c3448dab 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,5 +2,4 @@ 0002-Use-system-MathJax.patch 0003-Offline-header-for-docs.patch 0004-Disable-Sphinx.patch -0005-Don-t-process-the-entire-source-tree-with-Doxygen.patch 0006-CGAL-5.5-compatibility.patch diff --git a/debian/rules b/debian/rules index f4dead2b..44c42084 100755 --- a/debian/rules +++ b/debian/rules @@ -46,20 +46,21 @@ execute_before_dh_auto_configure: done override_dh_auto_configure: - dh_auto_configure $(DHFLAGS) --builddirectory=build/userversion -- -DWITH_GUDHI_BENCHMARK=true -DWITH_GUDHI_EXAMPLE=true -DWITH_GUDHI_PYTHON=false -DWITH_GUDHI_TEST=true -DWITH_GUDHI_UTILITIES=true $(HERA_FLAGS) + dh_auto_configure $(DHFLAGS) --sourcedir=build/userversion --builddirectory=build/userversion/build -- -DWITH_GUDHI_BENCHMARK=true -DWITH_GUDHI_EXAMPLE=true -DWITH_GUDHI_PYTHON=false -DWITH_GUDHI_TEST=true -DWITH_GUDHI_UTILITIES=true $(HERA_FLAGS) for py3ver in $(PY3VERS) ; do \ - dh_auto_configure $(DHFLAGS) --builddirectory=build-py$$py3ver/userversion -- -DWITH_GUDHI_BENCHMARK=false -DWITH_GUDHI_EXAMPLE=false -DWITH_GUDHI_PYTHON=true -DWITH_GUDHI_TEST=true -DWITH_GUDHI_UTILITIES=false -DPython_ADDITIONAL_VERSIONS=$$py3ver -DWITH_GUDHI_PYTHON_RUNTIME_LIBRARY_DIRS=false $(HERA_FLAGS) ; \ + dh_auto_configure $(DHFLAGS) --sourcedir=build-py$$py3ver/userversion --builddirectory=build-py$$py3ver/userversion/build -- -DWITH_GUDHI_BENCHMARK=false -DWITH_GUDHI_EXAMPLE=false -DWITH_GUDHI_PYTHON=true -DWITH_GUDHI_TEST=true -DWITH_GUDHI_UTILITIES=false -DPython_ADDITIONAL_VERSIONS=$$py3ver -DWITH_GUDHI_PYTHON_RUNTIME_LIBRARY_DIRS=false $(HERA_FLAGS) ; \ done override_dh_auto_build-arch: - dh_auto_build $(DHFLAGS) --builddirectory=build/userversion + dh_auto_build $(DHFLAGS) --sourcedir=build/userversion --builddirectory=build/userversion/build for py3ver in $(PY3VERS) ; do \ - cd build-py$$py3ver/userversion/src/python ; \ + cd build-py$$py3ver/userversion/build/python ; \ /usr/bin/python$$py3ver setup.py build ; \ done override_dh_auto_build-indep: - make -C build/userversion doxygen + cd build/userversion/build ; \ + make doxygen override_dh_auto_test-indep: @@ -67,15 +68,15 @@ override_dh_auto_test-arch: # I believe this should be handled automatically by dh_auto_test, # but see #901678. ifeq (, $(filter nocheck,$(DEB_BUILD_MAINT_OPTIONS))) - dh_auto_test $(DHFLAGS) --no-parallel --builddirectory=build/userversion + dh_auto_test $(DHFLAGS) --no-parallel --sourcedir=build/userversion --builddirectory=build/userversion/build else @echo "Skipping tests due to nocheck flag." endif override_dh_auto_install-arch: - dh_auto_install $(DHFLAGS) --builddirectory=build/userversion + dh_auto_install $(DHFLAGS) --sourcedir=build/userversion --builddirectory=build/userversion/build for py3ver in $(PY3VERS) ; do \ - cd build-py$$py3ver/userversion/src/python ; \ + cd build-py$$py3ver/userversion/build/python ; \ /usr/bin/python$$py3ver setup.py install --root=../../../../debian/tmp --single-version-externally-managed --install-layout=deb ; \ done @@ -130,6 +131,11 @@ override_dh_missing: override_dh_python3: for py3ver in $(PY3VERS) ; do \ - dh_python3 -O--builddirectory=build-py$$py3ver/userversion ; \ + dh_python3 -O--sourcedir=build-py$$py3ver/userversion ; \ done +execute_before_dh_auto_clean: + rm -rf build + for py3ver in $(PY3VERS) ; do \ + rm -rf build-py$$py3ver ; \ + done |