[shibboleth-sp2] 04/12: Rename files via dh-exec, now that we use it anyway

[Ferenc Wágner]

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

wferi-guest pushed a commit to branch debian/master
in repository shibboleth-sp2.

commit f46e4aca49cc3b2ed5d97890c788857deafd3cb1
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Thu Mar 10 22:16:22 2016 +0100

    Rename files via dh-exec, now that we use it anyway
---
 debian/clean                        | 1 -
 debian/rules                        | 9 ++++-----
 debian/shibboleth-sp2-utils.install | 3 +++
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/clean b/debian/clean
index 1602e21..da295ea 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,2 +1 @@
-debian/shibboleth-sp2-utils.shibd.init
 shibsp/paths.h
diff --git a/debian/rules b/debian/rules
index dd648c8..ae03356 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,10 +54,6 @@ override_dh_auto_install:
 	rm debian/tmp/etc/shibboleth/shibd-redhat
 	rm debian/tmp/etc/shibboleth/shibd-suse
 	chmod +x debian/tmp/etc/shibboleth/keygen.sh
-	mv debian/tmp/etc/shibboleth/keygen.sh debian/tmp/usr/sbin/shib-keygen
-	mv debian/tmp/etc/shibboleth/metagen.sh debian/tmp/usr/bin/shib-metagen
-	mv debian/tmp/etc/shibboleth/shibd-debian \
-	    debian/shibboleth-sp2-utils.shibd.init
 	mkdir -p debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/shibsp
 	mv debian/tmp/usr/include/shibsp/paths.h \
 	    debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/shibsp/
@@ -82,7 +78,10 @@ override_dh_installdocs:
 	dh_installdocs -A doc/NOTICE.txt doc/CREDITS.txt doc/RELEASE.txt doc/README.txt
 
 override_dh_installinit:
-	dh_installinit --name=shibd
+# dh_installinit does not find the init script installed by dh_install,
+# so we have to handle default+tmpfile and the maintainer scripts separately
+	dh_installinit -p shibboleth-sp2-utils --name=shibd --noscripts
+	dh_installinit -p shibboleth-sp2-utils --name=shibd --onlyscripts
 
 override_dh_fixperms:
 	dh_fixperms
diff --git a/debian/shibboleth-sp2-utils.install b/debian/shibboleth-sp2-utils.install
index 9228a83..e49e288 100755
--- a/debian/shibboleth-sp2-utils.install
+++ b/debian/shibboleth-sp2-utils.install
@@ -1,5 +1,8 @@
 #!/usr/bin/dh-exec
 
+etc/shibboleth/keygen.sh     => usr/sbin/shib-keygen
+etc/shibboleth/metagen.sh    => usr/bin/shib-metagen
+etc/shibboleth/shibd-debian  => etc/init.d/shibd
 etc/shibboleth/shibd-systemd => lib/systemd/system/shibd.service [linux-any]
 usr/bin
 usr/lib/*/shibboleth/shibauthorizer

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