[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, master, updated. 559e8b79e4672b5fc6a57651c93e2bb09bf30eee

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 559e8b79e4672b5fc6a57651c93e2bb09bf30eee
Author: Alexander Wirt <formorer at debian.org>
Date:   Fri Nov 11 21:56:32 2011 +0100

    Migrate configuration files to /etc/icinga/objects/check_mk

diff --git a/debian/check-mk-config-icinga.postinst b/debian/check-mk-config-icinga.postinst
index 77718dc..0f3b09c 100644
--- a/debian/check-mk-config-icinga.postinst
+++ b/debian/check-mk-config-icinga.postinst
@@ -16,6 +16,19 @@ setperm() {
     fi
 }
 
+dpkg-maintscript-helper mv_conffile \
+    /etc/icinga/objects/check_mk_templates.cfg \
+    /etc/icinga/objects/check_mk/check_mk_templates.cfg \
+    1.1.10-2 \
+    check-mk-config-icinga. -- "$@"
+
+if [ -e '/etc/icinga/objects/check_mk_objects.cfg' ];
+then
+    echo 'Migrate /etc/icinga/objects/check_mk_objects.cfg to /etc/icinga/objects/check_mk/check_mk_objects.cfg'
+    mv /etc/icinga/objects/check_mk_objects.cfg \
+    /etc/icinga/objects/check_mk/check_mk_objects.cfg
+fi
+
 case "$1" in
 	  configure)
 		#make sure our nagios user exists  
diff --git a/debian/check-mk-config-icinga.postrm b/debian/check-mk-config-icinga.postrm
new file mode 100644
index 0000000..d27aad1
--- /dev/null
+++ b/debian/check-mk-config-icinga.postrm
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+dpkg-maintscript-helper mv_conffile \
+    /etc/icinga/objects/check_mk_templates.cfg \
+    /etc/icinga/objects/check_mk/check_mk_templates.cfg \
+    1.1.10-2 \
+    check-mk-config-icinga. -- "$@"
diff --git a/debian/check-mk-config-icinga.preinst b/debian/check-mk-config-icinga.preinst
new file mode 100644
index 0000000..d27aad1
--- /dev/null
+++ b/debian/check-mk-config-icinga.preinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+dpkg-maintscript-helper mv_conffile \
+    /etc/icinga/objects/check_mk_templates.cfg \
+    /etc/icinga/objects/check_mk/check_mk_templates.cfg \
+    1.1.10-2 \
+    check-mk-config-icinga. -- "$@"
diff --git a/debian/control b/debian/control
index c77e062..9857c80 100644
--- a/debian/control
+++ b/debian/control
@@ -39,6 +39,7 @@ Description: general purpose nagios-plugin for retrieving data
 
 Package: check-mk-server
 Architecture: any
+Pre-Depends: Pre-Depends: dpkg (>= 1.15.7.2)
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, python, check-mk-config-nagios3 | check-mk-config-icinga
 Recommends: check-mk-doc
 Description: general purpose nagios-plugin for retrieving data

-- 
UNNAMED PROJECT