[debhelper-devel] [debhelper] 06/21: dh: Replace systemd sequence with dh_installsystemd [c11]

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 34eef4098688037a5380a71e37b4ecf45a89519a
Author: Niels Thykier <niels at thykier.net>
Date:   Wed Oct 4 18:44:23 2017 +0000

    dh: Replace systemd sequence with dh_installsystemd [c11]
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 dh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dh b/dh
index 091b353..721b842 100755
--- a/dh
+++ b/dh
@@ -295,7 +295,9 @@ if (not compat(9, 1)) {
 	# sequence add-on so existing --without=autoreconf
 	unshift(@ARGV, "--with=autoreconf");
 	# Enable systemd support by default in compat 10 or later.
-	unshift(@ARGV, "--with=systemd");
+	# - compat 11 injects the dh_installsystemd tool directly in the
+	#   sequence instead of using a --with sequence.
+	unshift(@ARGV, "--with=systemd") if compat(10, 1);
 	unshift(@ARGV, "--with=build-stamp");
 }
 
@@ -398,6 +400,10 @@ my @i = (qw{
 	dh_installifupdown
 	dh_installinfo
 	dh_installinit
+},
+   (!compat(10) ? qw(dh_installsystemd) : qw()),
+
+qw{
 	dh_installmenu
 	dh_installmime
 	dh_installmodules

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git