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

[Bas Couwenberg (@sebastic)]

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


Commits:
9903701b by Bas Couwenberg at 2023-08-12T12:42:12+02:00
Use execute_{before,after} instead of override in rules file.

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -4,6 +4,7 @@ grass (8.3.0-2) UNRELEASED; urgency=medium
     (closes: #1040554)
   * Move git Recommends from grass-dev to grass-core for g.extension,
     and move subversion to grass-core Suggests for g.extension.
+  * Use execute_{before,after} instead of override in rules file.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 07 Jul 2023 17:52:56 +0200
 


=====================================
debian/rules
=====================================
@@ -38,13 +38,12 @@ templates:
 %:
 	dh $@ --with python3,numpy3
 
-override_dh_clean:
-	dh_clean debian/grass-gui.image-file-in-usr-lib.list
-
+execute_after_dh_clean:
 	$(RM) lib/proj/nad2bin
 	$(RM) utils/timer/main.o
 	$(RM) raster/r.terraflow/IOStream/lib/src/libiostream.a
 	$(RM) debian/$(BASE_NAME).1
+	$(RM) debian/grass-gui.image-file-in-usr-lib.list
 	$(RM) error.log
 
 	# clean doxygen documentation (programming man)
@@ -106,8 +105,7 @@ override_dh_auto_configure: templates
                     --with-x \
                     --with-zstd
 
-override_dh_auto_build:
-	dh_auto_build
+execute_after_dh_auto_build:
 	chmod 755 debian/fixpaths.sh
 
 	# generate the Programmers' manual (in HTML)
@@ -207,13 +205,12 @@ override_dh_auto_install:
 	# Remove empty files
 	find debian/tmp/ -type f -empty -name "class_graphical*" -print -delete
 
-override_dh_install:
+execute_before_dh_install:
 	# Strip binaries
 	strip --strip-unneeded --remove-section=.comment --remove-section=.note debian/tmp/usr/lib/$(BASE_NAME)/bin/r.in.png
 	strip --strip-unneeded --remove-section=.comment --remove-section=.note debian/tmp/usr/lib/$(BASE_NAME)/bin/r.out.png
 
-	dh_install
-
+execute_after_dh_install:
 	# delete duplicated grass-gui stuff from grass-core package
 	for COMPONENT in gui wxpython; do \
 		rm -rf debian/$(PKG_NAME)-core/usr/lib/$(BASE_NAME)/$$COMPONENT; \



View it on GitLab: https://salsa.debian.org/debian-gis-team/grass/-/commit/9903701b0a5227a8afed24ebf16f8ea0358669e0

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/grass/-/commit/9903701b0a5227a8afed24ebf16f8ea0358669e0
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/9933dcaf/attachment-0001.htm>