[Pkg-nagios-changes] [pkg-nagios] r848 - nagios-nsca/trunk/debian

Tue Feb 21 21:01:19 UTC 2006

Author: zugschlus
Date: 2006-02-21 21:01:18 +0000 (Tue, 21 Feb 2006)
New Revision: 848

Added:
   nagios-nsca/trunk/debian/nsca-client.install
   nagios-nsca/trunk/debian/nsca-client.manpages
   nagios-nsca/trunk/debian/nsca.examples
   nagios-nsca/trunk/debian/nsca.manpages
Modified:
   nagios-nsca/trunk/debian/changelog
   nagios-nsca/trunk/debian/control
   nagios-nsca/trunk/debian/rules
Log:
  * Add possibility to locally build an nsca-client package which cannot
    be in Debian.



Modified: nagios-nsca/trunk/debian/changelog
===================================================================

--- nagios-nsca/trunk/debian/changelog	2006-02-18 16:17:35 UTC (rev 847)
+++ nagios-nsca/trunk/debian/changelog	2006-02-21 21:01:18 UTC (rev 848)
@@ -1,10 +1,12 @@
-nsca (2.5-1.0) UNRELEASED; urgency=low
+nsca (2.5-1.1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
   * remove install calls from debian/rules, use dh_install to ease
     backporting. Adapt lintian override file to nagios2 method.
+  * Add possibility to locally build an nsca-client package which cannot
+    be in Debian.
 
- -- Marc Haber <mh+debian-packages at zugschlus.de>  Fri, 17 Feb 2006 10:55:18 +0000
+ -- Marc Haber <mh+debian-packages at zugschlus.de>  Tue, 21 Feb 2006 21:00:22 +0000
 
 nsca (2.5-1) unstable; urgency=low
 

Modified: nagios-nsca/trunk/debian/control
===================================================================
--- nagios-nsca/trunk/debian/control	2006-02-18 16:17:35 UTC (rev 847)
+++ nagios-nsca/trunk/debian/control	2006-02-21 21:01:18 UTC (rev 848)
@@ -11,13 +11,14 @@
 Depends: ${shlibs:Depends}
 Suggests: nagios, nagios-plugins-basic | nagios-plugins
 Description: Nagios service monitor agent
- The purpose of this addon is to allow you to send service check
- results to a central monitoring server running Nagios in a secure
- manner.
+ This addon allows you to send service check results to a central
+ monitoring server running Nagios in a reasonably secure manner.
  .
- Nagios is a host/service/network monitoring and management system. It has
- the following features:
+ Nagios is a monitoring and management system for hosts, services and
+ networks.
  .
+ Nagios' features include:
+ .
  o  Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP,
       PING, etc.)
  o  Plugin interface to allow for user-developed service checks
@@ -29,3 +30,32 @@
  .
  Nagios was written in C and is designed to be easy to understand and modify
  to fit your own needs.
+
+Package: nsca-client
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: nsca
+Description: Nagios service monitor agent - client package
+ This package contains only the client part of nsca and is thus
+ suitable for installation on systems that only report passive service
+ checks to a central server. It is not part of official Debian and not
+ built by default. You can enable building of this package in
+ debian/rules.
+ .
+ Nagios is a monitoring and management system for hosts, services and
+ networks.
+ .
+ Nagios' features include:
+ .
+ o  Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP,
+      PING, etc.)
+ o  Plugin interface to allow for user-developed service checks
+ o  Contact notifications when problems occur and get resolved (via email,
+      pager, or user-defined method)
+ o  Ability to define event handlers to be run during service or host events
+      (for proactive problem resolution)
+ o  Web output (current status, notifications, problem history, log file, etc.)
+ .
+ Nagios was written in C and is designed to be easy to understand and modify
+ to fit your own needs.
+

Added: nagios-nsca/trunk/debian/nsca-client.install
===================================================================
--- nagios-nsca/trunk/debian/nsca-client.install	2006-02-18 16:17:35 UTC (rev 847)
+++ nagios-nsca/trunk/debian/nsca-client.install	2006-02-21 21:01:18 UTC (rev 848)
@@ -0,0 +1,2 @@
+src/send_nsca usr/sbin
+sample-config/send_nsca.cfg etc

Added: nagios-nsca/trunk/debian/nsca-client.manpages
===================================================================
--- nagios-nsca/trunk/debian/nsca-client.manpages	2006-02-18 16:17:35 UTC (rev 847)
+++ nagios-nsca/trunk/debian/nsca-client.manpages	2006-02-21 21:01:18 UTC (rev 848)
@@ -0,0 +1 @@
+debian/send_nsca.1

Added: nagios-nsca/trunk/debian/nsca.examples
===================================================================
--- nagios-nsca/trunk/debian/nsca.examples	2006-02-18 16:17:35 UTC (rev 847)
+++ nagios-nsca/trunk/debian/nsca.examples	2006-02-21 21:01:18 UTC (rev 848)
@@ -0,0 +1 @@
+sample-config/nsca.xinetd

Added: nagios-nsca/trunk/debian/nsca.manpages
===================================================================
--- nagios-nsca/trunk/debian/nsca.manpages	2006-02-18 16:17:35 UTC (rev 847)
+++ nagios-nsca/trunk/debian/nsca.manpages	2006-02-21 21:01:18 UTC (rev 848)
@@ -0,0 +1,2 @@
+debian/nsca.1
+debian/send_nsca.1

Modified: nagios-nsca/trunk/debian/rules
===================================================================
--- nagios-nsca/trunk/debian/rules	2006-02-18 16:17:35 UTC (rev 847)
+++ nagios-nsca/trunk/debian/rules	2006-02-21 21:01:18 UTC (rev 848)
@@ -9,6 +9,9 @@
 	INSTALL_PROGRAM += -s
 endif
 
+# Should we build nsca-client
+buildclientpackage=no
+
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -19,47 +22,58 @@
 NSCA=debian/nsca
 SEND_NSCA=debian/nsca
 
+# set variables for packages to build
+ifeq ($(buildclientpackage),yes)
+buildpackages=nsca nsca-client
+else
+buildpackages=nsca
+endif
+
+# generate -pexim4-base -peximon4 ... commandline for debhelper
+dhbuildpackages=$(addprefix -p,$(buildpackages))
+
 build: build-stamp
 build-stamp: patch-stamp
-	dh_testdir
+	dh_testdir $(dhbuildpackages)
 	./configure --with-nsca-user=nagios --with-nsca-grp=nogroup --with-nsca-port=5667 --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib/nagios
 	$(MAKE) all
 	touch build-stamp
 
 clean: unpatch
-	dh_testdir
-	dh_testroot
+	dh_testdir $(dhbuildpackages)
+	dh_testroot $(dhbuildpackages)
 	if test -f Makefile; then $(MAKE) distclean; fi
 	dh_clean
 	rm -f {build,install}-stamp
 
 install: install-stamp
 install-stamp: build-stamp
-	dh_testdir
-	dh_testroot
+	dh_testdir $(dhbuildpackages)
+	dh_testroot $(dhbuildpackages)
 	dh_clean -k
-	dh_installdirs
-	dh_installchangelogs Changelog
-	dh_installdocs README
-	dh_installexamples sample-config/nsca.xinetd
-	dh_installinit -u defaults 30
-	dh_installman debian/nsca.1 debian/send_nsca.1
-	dh_install
+	dh_installdirs $(dhbuildpackages)
+	dh_installchangelogs $(dhbuildpackages) Changelog
+	dh_installdocs $(dhbuildpackages) README
+	dh_installexamples $(dhbuildpackages)
+	dh_installinit $(dhbuildpackages) -u defaults 30
+	dh_installman  $(dhbuildpackages)
+	dh_install $(dhbuildpackages)
 	chmod 640 debian/nsca/etc/nsca.cfg debian/nsca/etc/send_nsca.cfg
+	chmod 640 debian/nsca-client/etc/send_nsca.cfg || true
 	touch install-stamp
 
 binary: binary-indep binary-arch
 binary-indep: 
 binary-arch: install-stamp
-	dh_testdir
-	dh_testroot
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_testdir $(dhbuildpackages)
+	dh_testroot $(dhbuildpackages)
+	dh_strip $(dhbuildpackages)
+	dh_compress $(dhbuildpackages)
+	dh_fixperms $(dhbuildpackages)
+	dh_installdeb $(dhbuildpackages)
+	dh_shlibdeps $(dhbuildpackages)
+	dh_gencontrol $(dhbuildpackages)
+	dh_md5sums $(dhbuildpackages)
+	dh_builddeb $(dhbuildpackages)
 
 .PHONY: binary binary-arch binary-indep clean install


