[shibboleth-sp2] 14/17: Removal of unneeded files belongs to the dh_install step

[Ferenc Wágner]

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

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

commit 9c44db059997b14b705d706657dd2df9a7b11067
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Wed Aug 31 14:45:33 2016 +0200

    Removal of unneeded files belongs to the dh_install step
---
 debian/rules | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index c34bac2..8e4fb76 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,12 +32,12 @@ override_dh_auto_configure:
 	    $(enable-systemd) \
 	    --with-memcached --with-fastcgi --with-gssapi $(DEBUG)
 
-# Move supporting scripts from the configuration directory into /usr/sbin
-# and remove various configuration files that aren't of interest on Debian.
-# Also move the one architecture-dependent header file into an
-# architecture-specific directory.
 override_dh_auto_install:
 	NOKEYGEN=1 dh_auto_install
+
+override_dh_install:
+	# The necessary documentation files are installed in each binary
+	# package by dh_installdocs below.
 	cd debian/tmp/usr/share/doc/shibboleth-* && \
 	    rm CREDITS.txt LICENSE.txt NOTICE.txt README.txt RELEASE.txt \
 	       FASTCGI.LICENSE OPENSSL.LICENSE LOG4CPP.LICENSE
@@ -47,11 +47,9 @@ override_dh_auto_install:
 	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/
-
+	dh_install --list-missing
 # This really should be --fail-missing, but #831786 made it impossible.
 # If no better solution emerges, I'd prefer backing out of using dh-exec.
-override_dh_install:
-	dh_install --list-missing
 
 UTIL_MANS:=$(patsubst %,debian/%, \
     mdquery.1 resolvertest.1 shib-metagen.1 shib-keygen.8 shibd.8)

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