[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 495fe20acb7e4ca1a3a2eb1000f662b3ce8501c8
Author: Alexander Wirt <formorer at debian.org>
Date:   Tue Apr 24 07:27:42 2012 +0200

    Install plpgsql for postgres < 9.0
    
    Closes: #659675

diff --git a/debian/icinga-idoutils.dirs b/debian/icinga-idoutils.dirs
index f2cb6df..a33f9b8 100644
--- a/debian/icinga-idoutils.dirs
+++ b/debian/icinga-idoutils.dirs
@@ -1,3 +1,4 @@
 etc/icinga
 usr/lib/icinga
 usr/share/dbconfig-common/data/icinga-idoutils/install/
+usr/share/dbconfig-common/data/icinga-idoutils/upgrade-dbadmin/
diff --git a/debian/icinga-idoutils.install b/debian/icinga-idoutils.install
index dd857e1..346ec5f 100644
--- a/debian/icinga-idoutils.install
+++ b/debian/icinga-idoutils.install
@@ -1 +1,2 @@
 module/idoutils/config/ido2db.cfg-sample usr/share/icinga/tmpl 
+debian/db/admin/pgsql usr/share/dbconfig-common/data/icinga-idoutils/install-dbadmin/
diff --git a/debian/rules b/debian/rules
index 8377a8e..1ec62e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -140,12 +140,8 @@ install-stamp: build-stamp fix-configs-stamp
 	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.0.1.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.0.1-1.sql
 	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.0.3.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.0.3-1.sql
 	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.3.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.2.99-1.sql
-	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.4.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.4.0-1.sql
-	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.5.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.5.0-1.sql
+	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.4.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.5.0-1.sql
 	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.6.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.6.0-1.sql
-
-
-	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.4.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.2.99-1.sql
 	# set up /var/cache/icinga for access by www-data
 	chgrp www-data ${b}/icinga-common/var/cache/icinga
 	chmod g+s ${b}/icinga-common/var/cache/icinga

-- 
debian packaging of icinga(-core)