[Git][debian-gis-team/josm][master] Use execute_after instead of override in rules file.

[Bas Couwenberg (@sebastic)]

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


Commits:
a181a0a3 by Bas Couwenberg at 2023-08-12T13:42:52+02:00
Use execute_after instead of override in rules file.

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,7 @@
 josm (0.0.svn18789+dfsg-2) UNRELEASED; urgency=medium
 
   * Remove generated files in clean target.
+  * Use execute_after instead of override in rules file.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 11 Aug 2023 10:41:17 +0200
 


=====================================
debian/rules
=====================================
@@ -35,9 +35,7 @@ override_dh_auto_build:
 
 	mv ca at valencia.po i18n/po/
 
-override_dh_auto_install:
-	dh_auto_install
-
+execute_after_dh_auto_install:
 	install -m 644 $(CURDIR)/dist/josm-custom.jar $(CURDIR)/debian/josm/usr/share/josm/josm-${DEB_UPSTREAM_VERSION}.jar
 	dh_link usr/share/josm/josm-${DEB_UPSTREAM_VERSION}.jar usr/share/josm/josm.jar
 
@@ -60,16 +58,17 @@ override_dh_auto_install:
 	install -d $(CURDIR)/debian/josm/usr/share/mime/packages
 	install -m 644 $(CURDIR)/native/linux/tested/usr/share/mime/packages/josm.xml $(CURDIR)/debian/josm/usr/share/mime/packages
 
-override_dh_install:
-	dh_install
-
+execute_after_dh_install:
 	# remove *.lang files, since we ship them in josm-l10n
 	rm -rf $(CURDIR)/debian/josm/usr/share/josm/data/*.lang
+
 	# remove executable bit
 	chmod a-x $(CURDIR)/debian/josm/usr/share/josm/data/defaultpresets.xml
+
 	# remove empty directory
 	[ -z "$(ls ${IMGSTYLES_DIR} 2> /dev/null)" ] && rm -rf ${IMGSTYLES_DIR}
 	rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/josm/usr/share/josm/data/security/
+
 	# check font in SVG files
 	sh $(CURDIR)/debian/images-check.sh
 



View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/-/commit/a181a0a362b2107903d6059c8b24553dbed81a26

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/-/commit/a181a0a362b2107903d6059c8b24553dbed81a26
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/4640e7a5/attachment-0001.htm>