[opensaml2] 01/03: Ship the installed documentation, not the one from the build tree

[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 opensaml2.

commit cfc875ae830a8362b56f01335330b2c642e6b39d
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Fri Jan 15 10:51:28 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/libsaml2-doc.install | 2 +-
 debian/rules                | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/libsaml2-doc.install b/debian/libsaml2-doc.install
index 2a35a1e..9119ff9 100644
--- a/debian/libsaml2-doc.install
+++ b/debian/libsaml2-doc.install
@@ -1 +1 @@
-doc/api/* usr/share/doc/libsaml2-doc
+usr/share/doc/opensaml-*/api/* usr/share/doc/libsaml2-doc
diff --git a/debian/rules b/debian/rules
index dcbd4d3..7390102 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,13 +20,14 @@ endif
 override_dh_auto_configure:
 	dh_auto_configure -- $(DEBUG)
 
-# Remove the upstream-installed documentation
 override_dh_install:
-	rm -r debian/tmp/usr/share/doc/opensaml*
-	dh_install -a -i --fail-missing
+	for i in README.txt LICENSE.txt NOTICE.txt LOG4CPP.LICENSE; do \
+	    rm debian/tmp/usr/share/doc/opensaml-*/$$i; \
+	done
+	dh_install --fail-missing
 
 override_dh_installdocs:
-	dh_installdocs -A doc/NOTICE.txt
+	dh_installdocs -A doc/NOTICE.txt doc/README.txt
 
 AXCPI=ax_create_pkgconfig_info.m4
 # use the fixed macro from autoconf-archive:

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