[Pkg-nagios-changes] [SCM] Debian packaging of icinga-web branch, master, updated. debian/1.7.0-2-2-g69c7ff2

[Markus Frosch]

The following commit has been merged in the master branch:
commit 69c7ff2d1f739d802d2152a312a52ae63b3527f9
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Sun Jun 17 16:43:00 2012 +0200

    fixed overwrite of some default configs

diff --git a/debian/icinga-web.install b/debian/icinga-web.install
index 9170282..738001b 100644
--- a/debian/icinga-web.install
+++ b/debian/icinga-web.install
@@ -1,20 +1,11 @@
-
-
-
-
-
-
-
-
-
-
 debian/apache2.conf /etc/icinga-web
-debian/cronks.xml etc/icinga-web/conf.d
+etc/icinga-web/conf.d/* etc/icinga-web/conf.d
 debian/database-ido.xml.tmpl usr/share/icinga-web/tmpl
 debian/database-web.xml.tmpl usr/share/icinga-web/tmpl
 debian/databases.xml etc/icinga-web/conf.d
+debian/cronks.xml etc/icinga-web/conf.d
 debian/module_reporting.xml etc/icinga-web/conf.d
-etc/icinga-web/conf.d/* etc/icinga-web/conf.d
+
 usr/app/* usr/share/icinga-web/app
 usr/bin/clearcache.sh usr/lib/icinga-web/bin
 usr/doc/* usr/share/doc/icinga-web

-- 
Debian packaging of icinga-web