[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 fd36c4006648e06ebc607132bb1d830776e0c51f
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Wed Jun 20 23:24:40 2012 +0200

    changed patch 10_db_version_fix - only update pgsql to 1.7.1

diff --git a/debian/patches/10_db_version_fix b/debian/patches/10_db_version_fix
index 1d8fdae..0fa4a92 100644
--- a/debian/patches/10_db_version_fix
+++ b/debian/patches/10_db_version_fix
@@ -1,17 +1,12 @@
 Description: Fixed database version string
- version string is 1.7.0 instead of 1.7.1
+ using db version 1.7.0 for MySQL
+ and 1.7.1 for PgSQL (only this schema changed)
  .
 Author: Markus Frosch <markus at lazyfrosch.de>
 Origin: other
 Forwarded: https://dev.icinga.org/issues/2694
-Last-Update: 2012-06-19
+Last-Update: 2012-06-20
 
---- icinga-web-1.7.1.orig/etc/schema/updates/oracle_v1-7-0_to_v1-7-1.sql
-+++ icinga-web-1.7.1/etc/schema/updates/oracle_v1-7-0_to_v1-7-1.sql
-@@ -1,2 +1,2 @@
- DELETE FROM nsm_db_version;
--INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.0', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-+INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
 --- icinga-web-1.7.1.orig/etc/schema/updates/pgsql_v1-7-0_to_v1-7-1.sql
 +++ icinga-web-1.7.1/etc/schema/updates/pgsql_v1-7-0_to_v1-7-1.sql
 @@ -1,4 +1,4 @@
@@ -21,9 +16,14 @@ Last-Update: 2012-06-19
  
  SELECT setval('nsm_target_target_id_seq','21');
 \ No newline at end of file
---- icinga-web-1.7.1.orig/etc/schema/updates/mysql_v1-7-0_to_v1-7-1.sql
-+++ icinga-web-1.7.1/etc/schema/updates/mysql_v1-7-0_to_v1-7-1.sql
-@@ -1,2 +1,2 @@
- DELETE FROM nsm_db_version;
--INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.0', NOW(), NOW());
-+INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.1', NOW(), NOW());
+--- icinga-web-1.7.1.orig/etc/schema/mysql.sql
++++ icinga-web-1.7.1/etc/schema/mysql.sql
+@@ -39,7 +39,7 @@ ALTER TABLE nsm_user_role ADD CONSTRAINT nsm_user_role_usro_role_id_nsm_role_rol
+ /*          Initial data import              */
+  
+ INSERT INTO nsm_user (user_id,user_account,user_name,user_firstname,user_lastname,user_password,user_salt,user_authsrc,user_email,user_disabled) VALUES ('1','0','root','Enoch','Root','42bc5093863dce8c150387a5bb7e3061cf3ea67d2cf1779671e1b0f435e953a1','0c099ae4627b144f3a7eaa763ba43b10fd5d1caa8738a98f11bb973bebc52ccd','internal','root at localhost.local','0');
+-INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.1', NOW(), NOW());
++INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.0', NOW(), NOW());
+ INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('1','IcingaHostgroup','Limit data access to specific hostgroups','IcingaDataHostgroupPrincipalTarget','icinga');
+ INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('2','IcingaServicegroup','Limit data access to specific servicegroups','IcingaDataServicegroupPrincipalTarget','icinga');
+ INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('3','IcingaHostCustomVariablePair','Limit data access to specific custom variables','IcingaDataHostCustomVariablePrincipalTarget','icinga');
diff --git a/debian/rules b/debian/rules
index f4f4a9f..ce27095 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,10 +48,11 @@ override_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/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
-	cp etc/schema/updates/mysql_v1-7-0_to_v1-7-1.sql ${b}/icinga-web/usr/share/dbconfig-common/data/icinga-web/upgrade/mysql/1.7.1-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/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