[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, master, updated. debian/1.1.12-1-13-g6d9d703

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 688edf4c2aa5e3ad25e9352961e46083794e883e
Author: Alexander Wirt <formorer at debian.org>
Date:   Tue Apr 3 17:00:21 2012 +0200

    Fix usage of dpkg-maintscript-helper
    
    Closes: #659548
    Thanks: Colin Watson for the patch

diff --git a/debian/check-mk-config-icinga.postinst b/debian/check-mk-config-icinga.postinst
index 0f3b09c..bc39120 100644
--- a/debian/check-mk-config-icinga.postinst
+++ b/debian/check-mk-config-icinga.postinst
@@ -19,8 +19,7 @@ setperm() {
 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. -- "$@"
+    1.1.10-2 -- "$@"
 
 if [ -e '/etc/icinga/objects/check_mk_objects.cfg' ];
 then
diff --git a/debian/check-mk-config-icinga.postrm b/debian/check-mk-config-icinga.postrm
index b2b10ac..8f9d02e 100644
--- a/debian/check-mk-config-icinga.postrm
+++ b/debian/check-mk-config-icinga.postrm
@@ -5,8 +5,7 @@ set -e
 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. -- "$@"
+    1.1.10-2 -- "$@"
 
 #DEBHELPER#
 
diff --git a/debian/check-mk-config-icinga.preinst b/debian/check-mk-config-icinga.preinst
index b2b10ac..8f9d02e 100644
--- a/debian/check-mk-config-icinga.preinst
+++ b/debian/check-mk-config-icinga.preinst
@@ -5,8 +5,7 @@ set -e
 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. -- "$@"
+    1.1.10-2 -- "$@"
 
 #DEBHELPER#
 
diff --git a/debian/check-mk-config-nagios3.postinst b/debian/check-mk-config-nagios3.postinst
index b5f9d5a..f5b0bf6 100644
--- a/debian/check-mk-config-nagios3.postinst
+++ b/debian/check-mk-config-nagios3.postinst
@@ -19,8 +19,7 @@ setperm() {
 dpkg-maintscript-helper mv_conffile \
     /etc/nagios3/conf.d/check_mk_templates.cfg \
     /etc/nagios3/conf.d/check_mk/check_mk_templates.cfg \
-    1.1.10-2 \
-    check-mk-config-nagios3. -- "$@"
+    1.1.10-2 -- "$@"
 
 if [ -e '/etc/nagios3/conf.d/check_mk_objects.cfg' ];
 then
diff --git a/debian/check-mk-config-nagios3.postrm b/debian/check-mk-config-nagios3.postrm
index c291180..cdb5b1e 100644
--- a/debian/check-mk-config-nagios3.postrm
+++ b/debian/check-mk-config-nagios3.postrm
@@ -5,7 +5,6 @@ set -e
 dpkg-maintscript-helper mv_conffile \
     /etc/nagios3/conf.d/check_mk_templates.cfg \
     /etc/nagios3/conf.d/check_mk/check_mk_templates.cfg \
-    1.1.10-2 \
-    check-mk-config-nagios3. -- "$@"
+    1.1.10-2 -- "$@"
 
 #DEBHELPER#
diff --git a/debian/check-mk-config-nagios3.prerm b/debian/check-mk-config-nagios3.prerm
index c291180..e69de29 100644
--- a/debian/check-mk-config-nagios3.prerm
+++ b/debian/check-mk-config-nagios3.prerm
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-dpkg-maintscript-helper mv_conffile \
-    /etc/nagios3/conf.d/check_mk_templates.cfg \
-    /etc/nagios3/conf.d/check_mk/check_mk_templates.cfg \
-    1.1.10-2 \
-    check-mk-config-nagios3. -- "$@"
-
-#DEBHELPER#
diff --git a/debian/control b/debian/control
index dace706..186a22e 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,6 @@ Description: general purpose nagios-plugin for retrieving data
 
 Package: check-mk-server
 Architecture: any
-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, snmp
 Description: general purpose nagios-plugin for retrieving data
@@ -56,6 +55,7 @@ Description: general purpose nagios-plugin for retrieving data
 Package: check-mk-config-icinga
 Conflicts: check-mk-config-nagios3
 Architecture: any
+Pre-Depends: dpkg (>= 1.15.7.2~)
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
 Description: general purpose nagios-plugin for retrieving data
  Check_mk adopts a new a approach for collecting data from operating systems
@@ -69,6 +69,7 @@ Description: general purpose nagios-plugin for retrieving data
 
 Package: check-mk-config-nagios3
 Architecture: any
+Pre-Depends: dpkg (>= 1.15.7.2~)
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
 Conflicts: check-mk-config-icinga
 Description: general purpose nagios-plugin for retrieving data

-- 
UNNAMED PROJECT