[med-svn] [Git][med-team/bedops][master] Revert "d/rules: simplify"

[Michael R. Crusoe (@crusoe)]

Michael R. Crusoe pushed to branch master at Debian Med / bedops


Commits:
e2038776 by Michael R. Crusoe at 2024-12-17T16:48:41+01:00
Revert "d/rules: simplify"

This reverts commit 7dac80e534a473cda57948fbaee78009405029b1.

- - - - -


3 changed files:

- debian/changelog
- − debian/clean
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -3,7 +3,6 @@ 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 <crusoe at debian.org>  Mon, 16 Dec 2024 16:45:29 +0100


=====================================
debian/clean deleted
=====================================
@@ -1 +0,0 @@
-docs/_build


=====================================
debian/rules
=====================================
@@ -6,8 +6,12 @@
 
 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))
@@ -20,13 +24,14 @@ docpkg := $(DEB_SOURCE)-doc
 %:
 	dh $@
 
-execute_after_install-arch:
+override_dh_install-arch:
+	dh_install -a
 #	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/
 
-execute_before_dh_installdocs-indep:
+override_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)
@@ -34,10 +39,16 @@ execute_before_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
 
-execute_before_dh_installman-arch:
+override_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/-/commit/e2038776a422244ed38934eac49fbbc4ef574fde

-- 
View it on GitLab: https://salsa.debian.org/med-team/bedops/-/commit/e2038776a422244ed38934eac49fbbc4ef574fde
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20241217/361cc0b7/attachment-0001.htm>