Michael R. Crusoe pushed to branch master at Debian Med / bedops
Commits: 3b157fa5 by Michael R. Crusoe at 2024-12-16T16:58:32+01:00 Docs: added patch removing the use of intersphinx, it is unneeded and had the wrong layout. Closes: #1090091 - - - - - 7dac80e5 by Michael R. Crusoe at 2024-12-16T16:58:32+01:00 d/rules: simplify - - - - - 1681c6d0 by Michael R. Crusoe at 2024-12-16T16:58:32+01:00 d/control: need tcsh for the man pages - - - - - 6 changed files: - debian/changelog - + debian/clean - debian/control - + debian/patches/intersphinx - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,13 @@ +bedops (2.4.41+dfsg-3) UNRELEASED; urgency=medium + + * Team upload. + * Docs: added patch removing the use of intersphinx, it is unneeded + and had the wrong layout. Closes: #1090091 + * d/rules: simplify + * d/control: need tcsh for the man pages + + -- Michael R. Crusoe <[email protected]> Mon, 16 Dec 2024 16:45:29 +0100 + bedops (2.4.41+dfsg-2) unstable; urgency=medium * d/control: drop python3-distutils dependency. (Closes: #1065834) ===================================== debian/clean ===================================== @@ -0,0 +1 @@ +docs/_build ===================================== debian/control ===================================== @@ -8,10 +8,12 @@ Build-Depends: debhelper-compat (= 13), help2man, libbz2-dev, libjansson-dev, - zlib1g-dev + zlib1g-dev, + tcsh Build-Depends-Indep: sphinx-common, + dh-sequence-sphinxdoc, libjs-mathjax, - python3-sphinx, + python3-sphinx Standards-Version: 4.6.2 Vcs-Browser: https://salsa.debian.org/med-team/bedops Vcs-Git: https://salsa.debian.org/med-team/bedops.git ===================================== debian/patches/intersphinx ===================================== @@ -0,0 +1,15 @@ +From: Michael R. Crusoe <[email protected]> +Subject: remove intersphinx, it is unneeded and in the wrong format + +--- bedops.orig/docs/conf.py ++++ bedops/docs/conf.py +@@ -319,9 +319,6 @@ + #epub_use_index = True + + +-# Example configuration for intersphinx: refer to the Python standard library. +-intersphinx_mapping = {'http://docs.python.org/': None} +- + #RTD_OLD_THEME = True + + #html_style = 'test.css' ===================================== debian/patches/series ===================================== @@ -3,3 +3,4 @@ tests_use_installed_binaries.patch use_debian_libs parallel.patch adapt_to_new_sphinx.patch +intersphinx ===================================== debian/rules ===================================== @@ -6,12 +6,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all -include /usr/share/dpkg/pkg-info.mk - include /usr/share/dpkg/default.mk -include /usr/share/dpkg/architecture.mk - # less debug info to avoid running # out of address space ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel)) @@ -24,14 +20,13 @@ docpkg := $(DEB_SOURCE)-doc %: dh $@ -override_dh_install-arch: - dh_install -a +execute_after_install-arch: # sed -i 's:/bin/tcsh:/usr/bin/tcsh:g' bin/* mv bin/starch bin/bedops-starch mkdir -p debian/$(DEB_SOURCE)/usr/bin/ cp bin/* debian/$(DEB_SOURCE)/usr/bin/ -override_dh_installdocs-indep: +execute_before_dh_installdocs-indep: cd docs && make html mkdir -p debian/$(docpkg)/usr/share/doc/$(DEB_SOURCE) cp -r docs/_build/html debian/$(docpkg)/usr/share/doc/$(DEB_SOURCE) @@ -39,16 +34,10 @@ override_dh_installdocs-indep: find debian/$(docpkg)/usr/share/doc/$(DEB_SOURCE)/html/content -type f | xargs sed -i 's;https://cdn[js]*\..*//MathJax.js;../_static/mathjax.js;g' find debian/$(docpkg)/usr/share/doc/$(DEB_SOURCE)/html -type f | xargs sed -i 's;https://cdn[js]*\..*/MathJax.js;_static/mathjax.js;g' ln -s /usr/share/javascript/mathjax/MathJax.js debian/$(docpkg)/usr/share/doc/$(DEB_SOURCE)/html/_static/mathjax.js - dh_installdocs -i -override_dh_installman-arch: +execute_before_dh_installman-arch: cd bin && for f in * ; do help2man --no-discard-stderr --version-string="$(DEB_VERSION_UPSTREAM)" -o $$f.1 ./$$f; done - dh_installman -a override_dh_dwz: # Work around: dwz: Too few files for multifile optimization echo "Do not run dh_dwz" - -override_dh_auto_clean: - dh_auto_clean - rm -rf docs/_build/ View it on GitLab: https://salsa.debian.org/med-team/bedops/-/compare/be4371eebae2acbc87e050d2be6d085abaa29535...1681c6d0a00ff11aa0c2d4959c1539665f840146 -- View it on GitLab: https://salsa.debian.org/med-team/bedops/-/compare/be4371eebae2acbc87e050d2be6d085abaa29535...1681c6d0a00ff11aa0c2d4959c1539665f840146 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
