[cpp-sp] 19/37: Ship the installed documentation, not the one from the build tree

[Scott Cantor]

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

scantor pushed a commit to annotated tag debian/2.5.5+dfsg1-1
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=502e709c628227363f114b5fdded44cf94b892a1

commit 502e709c628227363f114b5fdded44cf94b892a1
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Thu Jan 21 01:36:18 2016 +0100

    Ship the installed documentation, not the one from the build tree
    
    Except for some select files, which go into all packages or none.
    This makes --fail-missing more sensitive to new files in the future.
---
 debian/libapache2-mod-shib2.docs |  2 --
 debian/libshibsp-doc.docs        |  2 --
 debian/libshibsp-doc.install     |  2 +-
 debian/rules                     | 10 +++++-----
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/debian/libapache2-mod-shib2.docs b/debian/libapache2-mod-shib2.docs
deleted file mode 100644
index 9ae799f..0000000
--- a/debian/libapache2-mod-shib2.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-doc/CREDITS.txt
-doc/README.txt
diff --git a/debian/libshibsp-doc.docs b/debian/libshibsp-doc.docs
deleted file mode 100644
index 9ae799f..0000000
--- a/debian/libshibsp-doc.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-doc/CREDITS.txt
-doc/README.txt
diff --git a/debian/libshibsp-doc.install b/debian/libshibsp-doc.install
index 0a48a11..3ed5f1c 100644
--- a/debian/libshibsp-doc.install
+++ b/debian/libshibsp-doc.install
@@ -1 +1 @@
-doc/api/* usr/share/doc/libshibsp-doc
+usr/share/doc/shibboleth-*/api/* usr/share/doc/libshibsp-doc
diff --git a/debian/rules b/debian/rules
index ae675b6..0c6779b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,8 +54,11 @@ override_dh_auto_configure:
 # architecture-specific directory.
 override_dh_auto_install:
 	NOKEYGEN=1 dh_auto_install
-	rm -r debian/tmp/usr/share/doc/shibboleth*
 	rm -r debian/tmp/var/run
+	for i in CREDITS.txt LICENSE.txt NOTICE.txt README.txt RELEASE.txt \
+	    FASTCGI.LICENSE OPENSSL.LICENSE LOG4CPP.LICENSE; do \
+	    rm debian/tmp/usr/share/doc/shibboleth-*/$$i; \
+	done
 	rm debian/tmp/etc/shibboleth/*.dist
 	rm debian/tmp/etc/shibboleth/*.config
 	rm debian/tmp/etc/shibboleth/shibd-osx.plist
@@ -91,11 +94,8 @@ override_dh_install:
 	    debian/shibboleth-sp2-utils/usr/share/man/man8/shibd.8
 	dh_install -s -i -X mod_shib2.so --fail-missing
 
-override_dh_installchangelogs:
-	dh_installchangelogs doc/RELEASE.txt
-
 override_dh_installdocs:
-	dh_installdocs -A doc/NOTICE.txt
+	dh_installdocs -A doc/NOTICE.txt doc/CREDITS.txt doc/RELEASE.txt doc/README.txt
 
 override_dh_installinit:
 	dh_installinit --name=shibd

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.