Replace dh overrides with execute_after_… where applicable

1 files changed, 3 insertions, 8 deletions

diff --git a/debian/rules b/debian/rules
index 71c278146..37eb8380e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -128,9 +128,7 @@ override_dh_installexamples-indep:
 	sed -i -e '1!b;s:^#!.*[ /]zsh:#!/bin/zsh:;s#/usr/local/bin#/usr/bin#' \
 	   debian/zsh-common/usr/share/doc/zsh-common/examples/Misc/*
 
-override_dh_install-indep:
-	dh_install -i
-
+execute_after_dh_install-indep:
 # Doesn't this need to go before we zcompile stuff into .zwc files? -- Axel
 	sed -i -e '1!b;s:^#!.*[ /]zsh:#!/bin/zsh:;s#/usr/local/bin#/usr/bin#;' \
 		`find debian/zsh-common/usr/share/zsh/functions -type f`
@@ -148,13 +146,10 @@ override_dh_shlibdeps-arch:
 		-dDepends    debian/zsh/bin/*   \
 		-dRecommends debian/zsh/usr/lib/*/zsh/*/zsh/*.so
 
-override_dh_installdocs-arch:
-	dh_installdocs -a
+execute_after_dh_installdocs-arch:
 	awk 'BEGIN { print "The following modules are statically-compiled into the static zsh binary:\n"; } /link=static/ { printf "%s (%s %s)\n", substr($$1,6), $$4, $$5; }' obj-static/config.modules >debian/zsh-static/usr/share/doc/zsh-static/README.Debian
 
-override_dh_install-arch:
-	dh_install -a
-
+execute_after_dh_install-arch:
 	mv debian/zsh-static/bin/zsh  debian/zsh-static/bin/zsh-static
 	mv debian/zsh-static/bin/zsh5 debian/zsh-static/bin/zsh5-static
 	sed -e 's:#!/bin/zsh:#!/bin/zsh-static:' -i debian/zsh-static/bin/zsh5-static