[Pkg-nagios-changes] [pkg-check-mk] 01/01: xinetd.conf example moved and upstream now provides and additional caching version

[Matt Taggart]

This is an automated email from the git hooks/post-receive script.

taggart pushed a commit to branch master
in repository pkg-check-mk.

commit 560df82a7a76f32e0bfc8adefb523e2f4110b1dc
Author: Matt Taggart <taggart at debian.org>
Date:   Mon Jan 2 10:44:46 2017 -0800

    xinetd.conf example moved and upstream now provides and additional caching version
---
 debian/changelog               | 1 +
 debian/check-mk-agent.examples | 1 +
 debian/rules                   | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8947e3d..986c3c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ check-mk (1.2.8p14-1) UNRELEASED; urgency=medium
   [ Matt Taggart ]
   * Imported Upstream version 1.2.8p14
   * upstream will now use coreutils timeout if available rather than waitmax
+  * xinetd.conf example moved, new xinetd_caching.conf
 
  -- Matt Taggart <taggart at debian.org>  Sat, 03 Dec 2016 18:11:37 +0100
 
diff --git a/debian/check-mk-agent.examples b/debian/check-mk-agent.examples
new file mode 100644
index 0000000..783e986
--- /dev/null
+++ b/debian/check-mk-agent.examples
@@ -0,0 +1 @@
+debian/tmp/usr/share/check_mk/agents/cfg_examples/xinetd.conf
diff --git a/debian/rules b/debian/rules
index ea55979..09ef65c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -100,7 +100,7 @@ install: build
 	cp debian/tmp/usr/bin/mkp debian/check-mk-server/usr/bin/
 	chmod +x debian/check-mk-server/usr/bin/mkp
 	# xinetd: provide config, but disabled by default
-	cp debian/tmp/usr/share/check_mk/agents/xinetd.conf debian/check-mk-agent/etc/xinetd.d/check_mk
+	cp debian/tmp/usr/share/check_mk/agents/cfg_examples/xinetd.conf debian/check-mk-agent/etc/xinetd.d/check_mk
 	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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-check-mk.git