[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, master, updated. 0c3827aca406859bd5d5512224a0c0a3cfa685d2

[Bernd Zeimetz]

The following commit has been merged in the master branch:
commit bd0ea1d19bed46f0702c6e664f4fb3c40a9ed10f
Author: Bernd Zeimetz <bernd at bzed.de>
Date:   Fri Nov 11 10:11:55 2011 +0100

    Add a check-mk-doc package and configure defaults accordingly.

diff --git a/debian/check-mk-doc.install b/debian/check-mk-doc.install
new file mode 100644
index 0000000..8044279
--- /dev/null
+++ b/debian/check-mk-doc.install
@@ -0,0 +1 @@
+usr/share/doc/check_mk/* usr/share/doc/check-mk-doc
diff --git a/debian/check-mk-server.install b/debian/check-mk-server.install
index a0ec915..397fee5 100644
--- a/debian/check-mk-server.install
+++ b/debian/check-mk-server.install
@@ -7,7 +7,6 @@ var/lib/check_mk/logwatch
 var/lib/check_mk/packages
 var/lib/check_mk/precompiled
 usr/bin/check_mk
-usr/share/doc/check_mk/check_mk_templates.cfg
 usr/share/check_mk/checks
 usr/share/check_mk/modules
 usr/share/check_mk/pnp-rraconf
diff --git a/debian/control b/debian/control
index e57a167..c77e062 100644
--- a/debian/control
+++ b/debian/control
@@ -40,6 +40,7 @@ Description: general purpose nagios-plugin for retrieving data
 Package: check-mk-server
 Architecture: any
 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
  Check_mk adopts a new a approach for collecting data from operating systems
  and network components. It obsoletes NRPE, check_by_ssh, NSClient and
@@ -83,6 +84,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: xinetd
 Conflicts: ucspi-unix
+Recommends: check-mk-doc
 Description: general purpose nagios-plugin for retrieving data
  Check_mk adopts a new a approach for collecting data from operating systems
  and network components. It obsoletes NRPE, check_by_ssh, NSClient and
@@ -96,7 +98,7 @@ Description: general purpose nagios-plugin for retrieving data
 Package: check-mk-multisite
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libapache2-mod-python, check-mk-config-nagios3 | check-mk-config-icinga
-Recommends: sudo
+Recommends: sudo, check-mk-doc
 Suggests: check-mk-livestatus
 Description: general purpose nagios-plugin for retrieving data
  Check_mk adopts a new a approach for collecting data from operating systems
@@ -108,3 +110,18 @@ Description: general purpose nagios-plugin for retrieving data
  .
  This package contains the webfrontend of check_mk also known as
  "MK-Multisite"
+
+Package: check-mk-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: check-mk-livestatus, check-mk-server, check-mk-multisite
+Description: general purpose nagios-plugin for retrieving data (documentation)
+ Check_mk adopts a new a approach for collecting data from operating systems
+ and network components. It obsoletes NRPE, check_by_ssh, NSClient and
+ check_snmp. It has many benefits, the most important of which are:
+ .
+  * Significant reduction of CPU usage on the Nagios host.
+  * Automatic inventory of items to be checked on hosts.
+ .
+ This package contains the check_mk documentation.
diff --git a/debian/defaults.icinga b/debian/defaults.icinga
index c552b07..a1377f1 100644
--- a/debian/defaults.icinga
+++ b/debian/defaults.icinga
@@ -46,5 +46,5 @@ url_prefix                  = '/'
 pnp_url                     = '/pnp4nagios/'
 pnp_templates_dir           = '/usr/share/check_mk/pnp-templates'
 pnp_rraconf_dir             = '/usr/share/check_mk/pnp-rraconf'
-doc_dir                     = '/usr/share/doc/check_mk'
+doc_dir                     = '/usr/share/doc/check-mk-doc'
 check_mk_automation         = 'sudo -u nagios /usr/bin/check_mk --automation'
diff --git a/debian/defaults.nagios3 b/debian/defaults.nagios3
index 2602cea..67be7ac 100644
--- a/debian/defaults.nagios3
+++ b/debian/defaults.nagios3
@@ -46,5 +46,5 @@ url_prefix                  = '/'
 pnp_url                     = '/pnp4nagios/'
 pnp_templates_dir           = '/usr/share/check_mk/pnp-templates'
 pnp_rraconf_dir             = '/usr/share/check_mk/pnp-rraconf'
-doc_dir                     = '/usr/share/doc/check_mk'
+doc_dir                     = '/usr/share/doc/check-mk-doc'
 check_mk_automation         = 'sudo -u nagios /usr/bin/check_mk --automation'

-- 
UNNAMED PROJECT