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

[Markus Frosch]

The following commit has been merged in the master branch:
commit 4094863d7f7df47fd0c4aeefdc0df0b6f227050e
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Wed Jun 20 23:42:22 2012 +0200

    removed extra installation of database schemas

diff --git a/debian/icinga-web.dirs b/debian/icinga-web.dirs
index 87d6f92..f19a06f 100644
--- a/debian/icinga-web.dirs
+++ b/debian/icinga-web.dirs
@@ -6,7 +6,6 @@ etc/icinga-web/conf.d
 
 usr/share/icinga-web
 usr/share/icinga-web/app
-usr/share/icinga-web/database
 usr/share/icinga-web/pub
 usr/share/icinga-web/lib
 usr/share/icinga-web/tmpl
diff --git a/debian/icinga-web.install b/debian/icinga-web.install
index 738001b..a7d16b8 100644
--- a/debian/icinga-web.install
+++ b/debian/icinga-web.install
@@ -9,7 +9,6 @@ debian/module_reporting.xml 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
-usr/etc/schema/* usr/share/icinga-web/database
 usr/lib/agavi usr/share/icinga-web/lib
 usr/lib/doctrine usr/share/icinga-web/lib
 usr/lib/ext3 usr/share/icinga-web/lib
diff --git a/debian/rules b/debian/rules
index ce27095..86e3415 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,13 +46,11 @@ override_dh_install:
 	# Install the rest
 	dh_install
 	# MySQL schema for dbconfig-common
-	cp ${b}/icinga-web/usr/share/icinga-web/database/mysql.sql ${b}/icinga-web/usr/share/dbconfig-common/data/icinga-web/install/mysql
+	cp etc/schema/mysql.sql ${b}/icinga-web/usr/share/dbconfig-common/data/icinga-web/install/mysql
 	cp etc/schema/updates/mysql_v1-6-2_to_v1-7.sql ${b}/icinga-web/usr/share/dbconfig-common/data/icinga-web/upgrade/mysql/1.7.0-1
 	# PGSQL schema for dbconfig-common
-	cp ${b}/icinga-web/usr/share/icinga-web/database/pgsql.sql ${b}/icinga-web/usr/share/dbconfig-common/data/icinga-web/install/pgsql
+	cp etc/schema/pgsql.sql ${b}/icinga-web/usr/share/dbconfig-common/data/icinga-web/install/pgsql
 	cp etc/schema/updates/pgsql_v1-7-0_to_v1-7-1.sql ${b}/icinga-web/usr/share/dbconfig-common/data/icinga-web/upgrade/pgsql/1.7.1-1
-	# removing unnecessary sql update files
-	rm ${b}/icinga-web/usr/share/icinga-web/database/updates/mysql_v1-7-0_to_v1-7-1.sql
 	###
 	# PNP
 	###

-- 
Debian packaging of icinga-web