[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 5a4c4ccc29c671e47596f2af20ac05f29255284a
Author: Alexander Wirt <formorer at debian.org>
Date:   Tue Apr 3 16:47:52 2012 +0200

    Move manpages to -server and don't compress docs
    
    Closes: #649676

diff --git a/debian/changelog b/debian/changelog
index b05f628..caf7c57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+check-mk (1.1.12p7-1) UNRELEASED; urgency=low
+
+  * [b088706] Add Recommends for snmp to server part
+  * [1708000] Imported Upstream version 1.1.12p7
+
+ -- Alexander Wirt <formorer at debian.org>  Fri, 30 Mar 2012 19:57:58 +0200
+
 check-mk (1.1.12-1) unstable; urgency=low
 
   [ Bernd Zeimetz ]
diff --git a/debian/check-mk-server.install b/debian/check-mk-server.install
index 397fee5..f2a9335 100644
--- a/debian/check-mk-server.install
+++ b/debian/check-mk-server.install
@@ -8,6 +8,7 @@ var/lib/check_mk/packages
 var/lib/check_mk/precompiled
 usr/bin/check_mk
 usr/share/check_mk/checks
+usr/share/check_mk/checks-man
 usr/share/check_mk/modules
 usr/share/check_mk/pnp-rraconf
 usr/share/check_mk/pnp-templates
diff --git a/debian/defaults.icinga b/debian/defaults.icinga
index a1377f1..58e0faa 100644
--- a/debian/defaults.icinga
+++ b/debian/defaults.icinga
@@ -11,7 +11,7 @@ check_mk_version            = '1.1.12'
 default_config_dir          = '/etc/check_mk'
 check_mk_configdir          = '/etc/check_mk/conf.d'
 checks_dir                  = '/usr/share/check_mk/checks'
-check_manpages_dir          = '/usr/share/doc/check_mk/checks'
+check_manpages_dir          = '/usr/share/check_mk/checks-man'
 modules_dir                 = '/usr/share/check_mk/modules'
 locale_dir                  = '/usr/share/check_mk/locale'
 agents_dir                  = '/usr/share/check_mk/agents'
diff --git a/debian/defaults.nagios3 b/debian/defaults.nagios3
index 67be7ac..b65186d 100644
--- a/debian/defaults.nagios3
+++ b/debian/defaults.nagios3
@@ -11,7 +11,7 @@ check_mk_version            = '1.1.12'
 default_config_dir          = '/etc/check_mk'
 check_mk_configdir          = '/etc/check_mk/conf.d'
 checks_dir                  = '/usr/share/check_mk/checks'
-check_manpages_dir          = '/usr/share/doc/check_mk/checks'
+check_manpages_dir          = '/usr/share/check_mk/checks-man'
 modules_dir                 = '/usr/share/check_mk/modules'
 locale_dir                  = '/usr/share/check_mk/locale'
 agents_dir                  = '/usr/share/check_mk/agents'
diff --git a/debian/rules b/debian/rules
index 77b8845..dd94e2e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,7 +83,8 @@ install: build
 	cp debian/tmp/usr/share/check_mk/agents/xinetd.conf debian/check-mk-agent/etc/xinetd.d/check_mk
 	# xinetd: Disable service
 	sed -i 's#disable\s*=\s*no#disable        = yes#' debian/check-mk-agent/etc/xinetd.d/check_mk
-
+	# move checks manpages (to be installed in -server)
+	mv debian/tmp/usr/share/doc/check_mk/checks debian/tmp/usr/share/check_mk/checks-man
 
 # Build architecture-independent files here.
 binary-indep: build install

-- 
UNNAMED PROJECT