[zookeeper] 05/08: Use `--name` option for dh_installinit and dh_systemd_enable

[Tony Mancill]

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

tmancill pushed a commit to branch master
in repository zookeeper.

commit e98e98226007d96d98f66bbc07ebb4f24151381c
Author: Felix Dreissig <f30 at f30.me>
Date:   Thu Jul 7 13:53:05 2016 +0200

    Use `--name` option for dh_installinit and dh_systemd_enable
    
    systemd unit files are currently installed by both programs (see Debian
    bug #830208).
    dh_systemd_enable does not support dh_installinit's `-d` option, so that
    "zookeeper.service" and "zookeeperd.service" would both get installed.
    Using `--name` fixes that, but of course also requires the source file
    names to match the right format.
---
 debian/rules                                                | 5 ++++-
 debian/{zookeeperd.default => zookeeperd.zookeeper.default} | 0
 debian/{zookeeperd.init => zookeeperd.zookeeper.init}       | 0
 debian/{zookeeperd.service => zookeeperd.zookeeper.service} | 0
 debian/{zookeeperd.upstart => zookeeperd.zookeeper.upstart} | 0
 5 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index b6a0f0a..f58e45c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -139,4 +139,7 @@ override_dh_auto_clean:
 	rm -rf src/c/TEST-*
 
 override_dh_installinit:
-	dh_installinit -d
+	dh_installinit --name=zookeeper
+
+override_dh_systemd_enable:
+	dh_systemd_enable --name=zookeeper
diff --git a/debian/zookeeperd.default b/debian/zookeeperd.zookeeper.default
similarity index 100%
rename from debian/zookeeperd.default
rename to debian/zookeeperd.zookeeper.default
diff --git a/debian/zookeeperd.init b/debian/zookeeperd.zookeeper.init
similarity index 100%
rename from debian/zookeeperd.init
rename to debian/zookeeperd.zookeeper.init
diff --git a/debian/zookeeperd.service b/debian/zookeeperd.zookeeper.service
similarity index 100%
rename from debian/zookeeperd.service
rename to debian/zookeeperd.zookeeper.service
diff --git a/debian/zookeeperd.upstart b/debian/zookeeperd.zookeeper.upstart
similarity index 100%
rename from debian/zookeeperd.upstart
rename to debian/zookeeperd.zookeeper.upstart

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