[Pkg-nagios-changes] [pkg-nagios] r699 - in nagios-nsca/trunk/debian: . patches

[Sean Finney]

Author: seanius
Date: 2006-02-12 20:28:43 +0000 (Sun, 12 Feb 2006)
New Revision: 699

Added:
   nagios-nsca/trunk/debian/patches/04_nsca.cfg_nagios_vs_nagios.dpatch
Modified:
   nagios-nsca/trunk/debian/changelog
   nagios-nsca/trunk/debian/patches/00list
   nagios-nsca/trunk/debian/rules
   nagios-nsca/trunk/debian/send_nsca.1
Log:
  * New upstream release

  [sean finney]
  * add patch to fix localstatedir file locations in nsca.cfg
  * fix for upstream shuffling of some files' location in the tarball.
  * lintian fixes in manpage
  * migrate to svn while we're at it.



Modified: nagios-nsca/trunk/debian/changelog
===================================================================
--- nagios-nsca/trunk/debian/changelog	2006-02-12 10:24:06 UTC (rev 698)
+++ nagios-nsca/trunk/debian/changelog	2006-02-12 20:28:43 UTC (rev 699)
@@ -1,3 +1,15 @@
+nsca (2.5-1) unstable; urgency=low
+
+  * New upstream release
+
+  [sean finney]
+  * add patch to fix localstatedir file locations in nsca.cfg
+  * fix for upstream shuffling of some files' location in the tarball.
+  * lintian fixes in manpage
+  * migrate to svn while we're at it.
+
+ -- sean finney <seanius at debian.org>  Sun, 12 Feb 2006 19:22:13 +0100
+
 nsca (2.4-6) unstable; urgency=low
 
   * Sean Finney:

Modified: nagios-nsca/trunk/debian/patches/00list
===================================================================
--- nagios-nsca/trunk/debian/patches/00list	2006-02-12 10:24:06 UTC (rev 698)
+++ nagios-nsca/trunk/debian/patches/00list	2006-02-12 20:28:43 UTC (rev 699)
@@ -1,3 +1,4 @@
 01_send_nsca.cfg.dpatch
 02_nsca_foreground.dpatch
 03_errors_to_stderr.dpatch
+04_nsca.cfg_nagios_vs_nagios.dpatch

Added: nagios-nsca/trunk/debian/patches/04_nsca.cfg_nagios_vs_nagios.dpatch
===================================================================
--- nagios-nsca/trunk/debian/patches/04_nsca.cfg_nagios_vs_nagios.dpatch	2006-02-12 10:24:06 UTC (rev 698)
+++ nagios-nsca/trunk/debian/patches/04_nsca.cfg_nagios_vs_nagios.dpatch	2006-02-12 20:28:43 UTC (rev 699)
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_nsca.cfg_nagios_vs_nagios.dpatch by  <seanius at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad nsca-2.5~/sample-config/nsca.cfg.in nsca-2.5/sample-config/nsca.cfg.in
+--- nsca-2.5~/sample-config/nsca.cfg.in	2006-01-22 01:14:55.000000000 +0100
++++ nsca-2.5/sample-config/nsca.cfg.in	2006-02-12 21:13:43.000000000 +0100
+@@ -56,8 +56,12 @@
+ # COMMAND FILE
+ # This is the location of the Nagios command file that the daemon
+ # should write all service check results that it receives.
+-
+-command_file=@localstatedir@/rw/nagios.cmd
++# Note to debian users: nagios 1.x and nagios 2.x have
++# different default locations for this file.  this is the
++# default location for nagios 1.x:
++command_file=/var/run/nagios/nagios.cmd
++# and this is the default location for nagios2:
++#command_file=/var/run/nagios2/rw/nagios.cmd
+ 
+ 
+ # ALTERNATE DUMP FILE
+@@ -70,8 +74,7 @@
+ # it starts Nagios.  Or you may simply choose to ignore any
+ # check results received while Nagios was not running...
+ 
+-alternate_dump_file=@localstatedir@/rw/nsca.dump
+-
++alternate_dump_file=/var/run/nagios/nsca.dump
+ 
+ 
+ # AGGREGATED WRITES OPTION


Property changes on: nagios-nsca/trunk/debian/patches/04_nsca.cfg_nagios_vs_nagios.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: nagios-nsca/trunk/debian/rules
===================================================================
--- nagios-nsca/trunk/debian/rules	2006-02-12 10:24:06 UTC (rev 698)
+++ nagios-nsca/trunk/debian/rules	2006-02-12 20:28:43 UTC (rev 699)
@@ -41,13 +41,13 @@
 	dh_installdirs
 	dh_installchangelogs Changelog
 	dh_installdocs README
-	dh_installexamples nsca.xinetd
+	dh_installexamples sample-config/nsca.xinetd
 	dh_installinit -u defaults 30
-	dh_installmanpages debian/nsca.1 debian/send_nsca.1
+	dh_installman debian/nsca.1 debian/send_nsca.1
 	install -D -m 755 src/nsca ${NSCA}/usr/sbin
-	install -D -m 640 nsca.cfg ${NSCA}/etc
+	install -D -m 640 sample-config/nsca.cfg ${NSCA}/etc
 	install -D -m 755 src/send_nsca ${SEND_NSCA}/usr/sbin
-	install -D -m 640 send_nsca.cfg ${SEND_NSCA}/etc
+	install -D -m 640 sample-config/send_nsca.cfg ${SEND_NSCA}/etc
 	install -D -m 644 debian/nsca.lintian-overrides ${NSCA}/usr/share/lintian/overrides/nsca
 	touch install-stamp
 

Modified: nagios-nsca/trunk/debian/send_nsca.1
===================================================================
--- nagios-nsca/trunk/debian/send_nsca.1	2006-02-12 10:24:06 UTC (rev 698)
+++ nagios-nsca/trunk/debian/send_nsca.1	2006-02-12 20:28:43 UTC (rev 699)
@@ -16,10 +16,10 @@
 one entry per line):
 .TP
 Service Checks
-<host_name>[tab]<svc_description>[tab]<return_code>[tab]<plugin_output>[newline]
+<host>\\t<svc_description>\\t<return_code>\\t<plugin_output>\\n
 .TP
 Host Checks:
-<host_name>[tab]<return_code>[tab]<plugin_output>[newline]
+<host>\\t<return_code>\\t<plugin_output>\\n
 
 .SH OPTIONS
 .TP
@@ -53,4 +53,4 @@
 .SH AUTHOR
 NSCA was written by Ethan Galstad <nagios at nagios.org>.
 This manpage was written by sean finney <seanius at debian.org> for 
-Debian (but it may be freely used by others).
+Debian (but it may be freely used, modified, and redistributed by others).