[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. debian/1.6.1-2-22-gc1c3991

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 309ba7a3955709c53e8e6deea119861f449e7bd9
Author: Alexander Wirt <formorer at debian.org>
Date:   Fri May 4 07:02:44 2012 +0200

    Fix db upgrade for postgres
    
    Closes: #641391

diff --git a/debian/patches/95_fix_db_upgrade.dpatch.diff b/debian/patches/95_fix_db_upgrade.dpatch.diff
new file mode 100644
index 0000000..5cc1677
--- /dev/null
+++ b/debian/patches/95_fix_db_upgrade.dpatch.diff
@@ -0,0 +1,56 @@
+--- icinga-1.6.1.orig/debian/patches/95_fix_db_upgrade.dpatch
++++ icinga-1.6.1/debian/patches/95_fix_db_upgrade.dpatch
+@@ -0,0 +1,53 @@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 95_fix_db_upgrade.dpatch by Alexander Wirt <formorer at debian.org>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: No description.
++
++ at DPATCH@
++diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-icinga~/module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.3.0.sql pkg-icinga/module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.3.0.sql
++--- pkg-icinga~/module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.3.0.sql	2011-11-26 09:13:04.000000000 +0100
+++++ pkg-icinga/module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.3.0.sql	2012-04-07 22:25:04.000000000 +0200
++@@ -8,8 +8,6 @@
++ -- Please check http://docs.icinga.org for upgrading information!
++ -- -----------------------------------------
++ 
++-CREATE LANGUAGE plpgsql;
++-
++ -- -----------------------------------------
++ -- update dbversion
++ -- -----------------------------------------
++@@ -50,22 +48,6 @@
++ 
++ 
++ -- -----------------------------------------
++--- drop unique keys for check history
++--- -----------------------------------------
++-
++-ALTER TABLE icinga_servicechecks DROP CONSTRAINT icinga_servicechecks_instance_id_key;
++-
++-ALTER TABLE icinga_hostchecks DROP CONSTRAINT icinga_hostchecks_instance_id_key;
++-
++--- -----------------------------------------
++--- drop unique keys for * contacts
++--- -----------------------------------------
++-
++-ALTER TABLE icinga_service_contacts DROP CONSTRAINT icinga_service_contacts_instance_id_key;
++-ALTER TABLE icinga_host_contacts DROP CONSTRAINT icinga_host_contacts_instance_id_key;
++-
++-
++--- -----------------------------------------
++ -- add address6 column to hosts
++ -- -----------------------------------------
++ 
++diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-icinga~/module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.5.0.sql pkg-icinga/module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.5.0.sql
++--- pkg-icinga~/module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.5.0.sql	2011-11-26 09:13:04.000000000 +0100
+++++ pkg-icinga/module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.5.0.sql	2012-04-07 22:25:04.000000000 +0200
++@@ -11,7 +11,6 @@
++ -- drop unique keys for multiline inserts
++ -- -----------------------------------------
++ 
++-ALTER TABLE icinga_timeperiod_timeranges DROP CONSTRAINT uq_timeperiod_timeranges;
++ ALTER TABLE icinga_host_parenthosts DROP CONSTRAINT uq_host_parenthosts;
++ ALTER TABLE icinga_host_contactgroups DROP CONSTRAINT uq_host_contactgroups;
++ ALTER TABLE icinga_service_contactgroups DROP CONSTRAINT uq_service_contactgroups;

-- 
debian packaging of icinga(-core)