[proftpd-dfsg] 01/01: Install init scripts using dh_installinit.

[Hilmar Preuße]

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

hilmar-guest pushed a commit to branch master
in repository proftpd-dfsg.

commit f70efdeef664347161ee76ae300a5ff119ef0f50
Author: Hilmar Preuße <hille42 at web.de>
Date:   Thu Dec 1 20:19:29 2016 +0100

    Install init scripts using dh_installinit.
---
 debian/changelog                                            | 1 +
 debian/{templates/default => proftpd-basic.proftpd.default} | 0
 debian/{proftpd-basic.init => proftpd-basic.proftpd.init}   | 0
 debian/rules                                                | 8 +++-----
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c7a32aa..4eecb6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,7 @@ proftpd-dfsg (1.3.5a-2) UNRELEASED; urgency=medium
     - call dh_auto_clean instead of manual "make distclean"
     - replace some install calls by entries in $package.install files
     - remove "-l option" from dh_shlibdeps call
+    - install init script and defaults file using dh_installinit
 
   [1] https://lists.debian.org/debian-devel-announce/2016/11/msg00001.html
 
diff --git a/debian/templates/default b/debian/proftpd-basic.proftpd.default
similarity index 100%
rename from debian/templates/default
rename to debian/proftpd-basic.proftpd.default
diff --git a/debian/proftpd-basic.init b/debian/proftpd-basic.proftpd.init
similarity index 100%
rename from debian/proftpd-basic.init
rename to debian/proftpd-basic.proftpd.init
diff --git a/debian/rules b/debian/rules
index 9a1ded0..de69f8e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -145,14 +145,12 @@ binary-arch: checkroot build install
 	# removes proftpd.conf installed by upstream
 	rm -f debian/$(PACKAGE)/etc/$(NAME)/$(NAME).conf
 
-	# The following two lines could be replaced by "dh_installinit -a"
-	# This needs overhaul/cleanup of {pre|post}{install|rm} scripts
-	# as dh_installinit installs own shell snippets.
-	install -m 755 debian/$(PACKAGE).init debian/$(PACKAGE)/etc/init.d/$(NAME)
-	install -m 644 debian/templates/default debian/$(PACKAGE)/etc/default/$(NAME)
 	# Not sure how to put this into a .files entry.
 	install contrib/xferstats.holger-preiss debian/$(PACKAGE)/usr/sbin/ftpstats
 	
+	# TODO: cleanup {pre|post}{install|rm} scripts; remove
+	# --no-scripts statement.
+	dh_installinit -a --name=proftpd --no-scripts
 	dh_installdebconf -a
 	dh_compress -a
 	dh_fixperms -a

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