[Pkg-nagios-changes] [SCM] Debian packaging of icinga-web branch, master, updated. debian/1.7.1-4-30-g98e0f8b

[Markus Frosch]

The following commit has been merged in the master branch:
commit 4719f36ac359f7593fea713839c4559e84749867
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Sat Oct 13 14:49:07 2012 +0200

    patch 10_db_version_fix no longer needed for 1.8.0

diff --git a/debian/patches/10_db_version_fix b/debian/patches/10_db_version_fix
deleted file mode 100644
index fa9fdc6..0000000
--- a/debian/patches/10_db_version_fix
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Fixed database version string
- to reflect the real version of the database schemas.
- .
- MySQL is on 1.7.0
- PgSQL is on 1.7.1 due to a sequence update
- .
-Author: Markus Frosch <markus at lazyfrosch.de>
-Origin: other
-Forwarded: https://dev.icinga.org/issues/2694
-Last-Update: 2012-08-13
-
---- a/etc/schema/mysql.sql
-+++ b/etc/schema/mysql.sql
-@@ -39,7 +39,7 @@
- /*          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/patches/series b/debian/patches/series
index 29b62ad..5a017ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-10_db_version_fix
 20_pgsql_statusquery_fix

-- 
Debian packaging of icinga-web