[Git][debian-gis-team/mapproxy][master] Use execute_{before,after} instead of override in rules file.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / mapproxy


Commits:
1efe5b54 by Bas Couwenberg at 2023-08-12T21:31:28+02:00
Use execute_{before,after} instead of override in rules file.

- - - - -


3 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -3,6 +3,7 @@ mapproxy (1.16.0+dfsg-2) UNRELEASED; urgency=medium
   * Bump debhelper compat to 13.
   * Don't set environment variables in dh_auto_install override.
   * Remove generated files in clean target.
+  * Use execute_{before,after} instead of override in rules file.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 12 Jun 2023 14:54:04 +0200
 


=====================================
debian/clean
=====================================
@@ -1,2 +1,4 @@
 *-info/
+doc/_build/
+
 debian/man/*.1


=====================================
debian/rules
=====================================
@@ -15,28 +15,20 @@ MANPAGES := $(wildcard debian/man/*.*.xml)
 %:
 	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 
-override_dh_auto_clean:
-	dh_auto_clean
-
-	$(RM) -r doc/_build/
-
-override_dh_auto_build:
+execute_before_dh_auto_build:
 	# Create man page from DocBook XML
 	for x in $(MANPAGES) ; do \
 	    docbook2x-man --string-param header-3="$(BUILD_DATE)" $$x ; \
 	    mv `basename $$x | sed 's/.xml$$//'` `dirname $$x` ; \
 	done
 
-	dh_auto_build
-
+execute_after_dh_auto_build:
 	(cd doc && PYTHONPATH=$(CURDIR) $(MAKE) html)
 
 override_dh_auto_test:
 	dh_auto_test || echo "Ignoring test failures"
 
-override_dh_auto_install:
-	dh_auto_install
-
+execute_after_dh_auto_install:
 	# Remove duplicate license file
 	$(RM) debian/*/usr/lib/python*/dist-packages/mapproxy/image/fonts/LICENSE
 
@@ -75,7 +67,5 @@ override_dh_auto_install:
 		      debian/python3-$(PYBUILD_NAME)/usr/lib/python$$V/dist-packages/mapproxy/test/system/fixture/cache_data ; \
 	done
 
-override_dh_install:
-	dh_install
-
+execute_after_dh_install:
 	$(RM) debian/*/usr/share/python*-mapproxy/test/schemas/*/*/ReadMe.txt



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapproxy/-/commit/1efe5b54e9b0edbcf2e8e75549d4240dc271820a

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapproxy/-/commit/1efe5b54e9b0edbcf2e8e75549d4240dc271820a
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/pkg-grass-devel/attachments/20230812/25d6c513/attachment-0001.htm>