[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, debian, updated. upstream/2.0.dfsg1-34-gc93a0ce

[Ferenc Wagner]

The following commit has been merged in the debian branch:
commit c93a0ce0b2bd6fe28d146dd49f775cbcd43b3553
Author: Ferenc Wagner <wferi at niif.hu>
Date:   Wed Jun 25 19:44:03 2008 +0200

    Include upstream documentation from the build tree

diff --git a/debian/libapache2-mod-shib2.install b/debian/libapache2-mod-shib2.install
index bf4c014..213bfc9 100644
--- a/debian/libapache2-mod-shib2.install
+++ b/debian/libapache2-mod-shib2.install
@@ -8,7 +8,5 @@ debian/tmp/var/run/shibboleth
 
 debian/shib.load	etc/apache2/mods-available
 
-debian/tmp/usr/share/doc/shibboleth/logo.jpg	usr/share/shibboleth
-debian/tmp/usr/share/doc/shibboleth/main.css	usr/share/shibboleth
-
-debian/tmp/usr/share/doc/shibboleth/*.txt	usr/share/doc/libapache2-mod-shib2
+doc/logo.jpg	usr/share/shibboleth
+doc/main.css	usr/share/shibboleth
diff --git a/debian/rules b/debian/rules
index 0c59ffa..e983d1e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,7 +91,7 @@ binary-arch: install-stamp
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs
-	dh_installdocs -A doc/NOTICE.txt
+	dh_installdocs -A doc/NOTICE.txt doc/CREDITS.txt doc/README.txt doc/RELEASE.txt
 	dh_installinit --name=shibd
 	dh_strip
 	dh_compress
@@ -108,7 +108,7 @@ binary-indep: install-stamp
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs
-	dh_installdocs -A doc/NOTICE.txt
+	dh_installdocs -A doc/NOTICE.txt doc/CREDITS.txt doc/README.txt doc/RELEASE.txt
 	dh_compress
 	dh_fixperms
 	dh_installdeb

-- 
Debian packaging for the 2.0 Apache Shibboleth SP