[Pkg-nagios-changes] [pkg-icinga-web] 06/07: Cleaned up installation of docs

[Markus Frosch]

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

lazyfrosch-guest pushed a commit to branch master
in repository pkg-icinga-web.

commit 2dca23c7c8a68907d2701e584cce0e3cb0163dba
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Sun Sep 8 19:04:07 2013 +0200

    Cleaned up installation of docs
---
 debian/icinga-web-pnp.install |    1 -
 debian/icinga-web.docs        |    4 ++++
 debian/icinga-web.install     |    1 -
 debian/rules                  |   11 -----------
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/debian/icinga-web-pnp.install b/debian/icinga-web-pnp.install
index 65f6a66..f367738 100644
--- a/debian/icinga-web-pnp.install
+++ b/debian/icinga-web-pnp.install
@@ -1,3 +1,2 @@
 contrib/PNP_Integration/README usr/share/doc/icinga-web-pnp
-contrib/PNP_Integration/doc/* usr/share/doc/icinga-web-pnp
 contrib/PNP_Integration/templateExtensions/* /usr/share/icinga-web/app/modules/Cronks/data/xml/extensions
diff --git a/debian/icinga-web.docs b/debian/icinga-web.docs
new file mode 100644
index 0000000..c8772e3
--- /dev/null
+++ b/debian/icinga-web.docs
@@ -0,0 +1,4 @@
+doc/CHANGELOG*
+doc/AUTHORS
+doc/THANKS
+doc/TODO
diff --git a/debian/icinga-web.install b/debian/icinga-web.install
index 2787681..9a64ace 100644
--- a/debian/icinga-web.install
+++ b/debian/icinga-web.install
@@ -8,7 +8,6 @@ debian/module_reporting.xml etc/icinga-web/conf.d
 
 usr/share/icinga-web/app/* usr/share/icinga-web/app
 usr/share/icinga-web/bin/clearcache.sh usr/lib/icinga-web/bin
-usr/share/icinga-web/doc/* usr/share/doc/icinga-web
 usr/share/icinga-web/lib/agavi usr/share/icinga-web/lib
 usr/share/icinga-web/lib/doctrine usr/share/icinga-web/lib
 usr/share/icinga-web/lib/ext3 usr/share/icinga-web/lib
diff --git a/debian/rules b/debian/rules
index 732600d..1609776 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,10 +40,6 @@ override_dh_auto_test:
 	echo "skipping tests - they are development only!"
 
 override_dh_install:
-	# removed INSTALL for policy
-	rm ${b}/tmp/usr/share/icinga-web/doc/INSTALL
-	# remove LICENSE files for packages - see debian/copyright
-	rm ${b}/tmp/usr/share/icinga-web/doc/LICENSE
 	# Remove empty paths
 	rm -rf ${b}/tmp/usr/share/icinga-web/lib/agavi/src/build/
 	rm -rf ${b}/tmp/usr/share/icinga-web/app/modules/Reporting/data/
@@ -69,12 +65,5 @@ override_dh_install:
 	cp etc/schema/updates/pgsql/pgsql_v1-8-3_to_v1-9.sql ${b}/icinga-web/usr/share/dbconfig-common/data/icinga-web/upgrade/pgsql/1.9.0~0schema
 	# rename apache config file
 	mv ${b}/icinga-web/etc/icinga-web/icinga-web.conf ${b}/icinga-web/etc/icinga-web/apache2.conf
-	###
-	# PNP
-	###
-	# Remove CHANGELOG from icinga-web-pnp
-	rm ${b}/icinga-web-pnp/usr/share/doc/icinga-web-pnp/CHANGELOG
-	# remove LICENSE files for packages - see debian/copyright
-	rm ${b}/icinga-web-pnp/usr/share/doc/icinga-web-pnp/LICENSE
 
 # vi: ts=4 sw=4 noexpandtab :

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga-web.git