[Pkg-nagios-changes] [pkg-nagios] r2021 - nagios-plugins/trunk/debian
Jan Wagner
waja at alioth.debian.org
Tue May 15 11:38:37 UTC 2012
Author: waja
Date: 2012-05-15 11:38:37 +0000 (Tue, 15 May 2012)
New Revision: 2021
Added:
nagios-plugins/trunk/debian/nagios-plugins-basic.links
nagios-plugins/trunk/debian/nagios-plugins-common.dirs
nagios-plugins/trunk/debian/nagios-plugins-common.docs
nagios-plugins/trunk/debian/nagios-plugins-common.examples
Removed:
nagios-plugins/trunk/debian/nagios-plugins-basic.docs
nagios-plugins/trunk/debian/nagios-plugins-basic.examples
Modified:
nagios-plugins/trunk/debian/changelog
nagios-plugins/trunk/debian/control
nagios-plugins/trunk/debian/nagios-plugins-standard.links
nagios-plugins/trunk/debian/nagios-plugins.links
nagios-plugins/trunk/debian/rules
Log:
create nagios-plugins-common package
Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog 2012-03-06 15:21:23 UTC (rev 2020)
+++ nagios-plugins/trunk/debian/changelog 2012-05-15 11:38:37 UTC (rev 2021)
@@ -1,5 +1,7 @@
nagios-plugins (1.4.15-6) UNRELEASED; urgency=low
+ * Add nagios-plugins-common package which ships files possibly needed also by
+ other plugin packages
* Add icinga as recommand as alternative for nagios3
* Add '-w %d' as ping argument for check_ping on non-linux plattforms, as
inetutils-ping is now supporting this, thanks Guillem Jover for bringing
Modified: nagios-plugins/trunk/debian/control
===================================================================
--- nagios-plugins/trunk/debian/control 2012-03-06 15:21:23 UTC (rev 2020)
+++ nagios-plugins/trunk/debian/control 2012-05-15 11:38:37 UTC (rev 2021)
@@ -21,9 +21,20 @@
(using nagios-nrpe-server or nsca), you may be interested in the
nagios-plugins-basic package.
+Package: nagios-plugins-common
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ucf
+Breaks: nagios-plugins-basic (<= 1.4.15-5)
+Suggests: nagios3 | icinga
+Description: Common files for plugins for nagios compatible monitoring
+ Common files for plugins for nagios compatible monitoring systems like Nagios
+ and Icinga.
+ .
+ This package contains common files which maybe needed for plugins.
+
Package: nagios-plugins-basic
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, procps, iputils-ping [linux-any], inetutils-ping [kfreebsd-any hurd-any], ucf
+Depends: ${shlibs:Depends}, ${misc:Depends}, nagios-plugins-common, procps, iputils-ping [linux-any], inetutils-ping [kfreebsd-any hurd-any], ucf
Conflicts: nagios-plugins (<= 1.4.2-3)
Replaces: nagios-plugins, nagios-plugins-standard
Suggests: nagios3 | icinga
Deleted: nagios-plugins/trunk/debian/nagios-plugins-basic.docs
===================================================================
--- nagios-plugins/trunk/debian/nagios-plugins-basic.docs 2012-03-06 15:21:23 UTC (rev 2020)
+++ nagios-plugins/trunk/debian/nagios-plugins-basic.docs 2012-05-15 11:38:37 UTC (rev 2021)
@@ -1,8 +0,0 @@
-FAQ
-NEWS
-README
-LEGAL
-REQUIREMENTS
-SUPPORT
-debian/NEWS.Debian
-debian/README.Debian
Deleted: nagios-plugins/trunk/debian/nagios-plugins-basic.examples
===================================================================
--- nagios-plugins/trunk/debian/nagios-plugins-basic.examples 2012-03-06 15:21:23 UTC (rev 2020)
+++ nagios-plugins/trunk/debian/nagios-plugins-basic.examples 2012-05-15 11:38:37 UTC (rev 2021)
@@ -1 +0,0 @@
-command.cfg
Copied: nagios-plugins/trunk/debian/nagios-plugins-basic.links (from rev 1989, nagios-plugins/trunk/debian/nagios-plugins-standard.links)
===================================================================
--- nagios-plugins/trunk/debian/nagios-plugins-basic.links (rev 0)
+++ nagios-plugins/trunk/debian/nagios-plugins-basic.links 2012-05-15 11:38:37 UTC (rev 2021)
@@ -0,0 +1,10 @@
+usr/share/doc/nagios-plugins-common/NEWS.Debian.gz usr/share/doc/nagios-plugins-basic/NEWS.Debian.gz
+usr/share/doc/nagios-plugins-common/README.Debian.gz usr/share/doc/nagios-plugins-basic/README.Debian.gz
+usr/share/doc/nagios-plugins-common/changelog.gz usr/share/doc/nagios-plugins-basic/changelog.gz
+usr/share/doc/nagios-plugins-common/examples usr/share/doc/nagios-plugins-basic/examples
+usr/share/doc/nagios-plugins-common/FAQ usr/share/doc/nagios-plugins-basic/FAQ
+usr/share/doc/nagios-plugins-common/NEWS.gz usr/share/doc/nagios-plugins-basic/NEWS.gz
+usr/share/doc/nagios-plugins-common/README usr/share/doc/nagios-plugins-basic/README
+usr/share/doc/nagios-plugins-common/LEGAL usr/share/doc/nagios-plugins-basic/LEGAL
+usr/share/doc/nagios-plugins-common/REQUIREMENTS usr/share/doc/nagios-plugins-basic/REQUIREMENTS
+usr/share/doc/nagios-plugins-common/SUPPORT usr/share/doc/nagios-plugins-basic/SUPPORT
Added: nagios-plugins/trunk/debian/nagios-plugins-common.dirs
===================================================================
--- nagios-plugins/trunk/debian/nagios-plugins-common.dirs (rev 0)
+++ nagios-plugins/trunk/debian/nagios-plugins-common.dirs 2012-05-15 11:38:37 UTC (rev 2021)
@@ -0,0 +1 @@
+usr/lib/nagios/plugins
\ No newline at end of file
Copied: nagios-plugins/trunk/debian/nagios-plugins-common.docs (from rev 1989, nagios-plugins/trunk/debian/nagios-plugins-basic.docs)
===================================================================
--- nagios-plugins/trunk/debian/nagios-plugins-common.docs (rev 0)
+++ nagios-plugins/trunk/debian/nagios-plugins-common.docs 2012-05-15 11:38:37 UTC (rev 2021)
@@ -0,0 +1,8 @@
+FAQ
+NEWS
+README
+LEGAL
+REQUIREMENTS
+SUPPORT
+debian/NEWS.Debian
+debian/README.Debian
Copied: nagios-plugins/trunk/debian/nagios-plugins-common.examples (from rev 1989, nagios-plugins/trunk/debian/nagios-plugins-basic.examples)
===================================================================
--- nagios-plugins/trunk/debian/nagios-plugins-common.examples (rev 0)
+++ nagios-plugins/trunk/debian/nagios-plugins-common.examples 2012-05-15 11:38:37 UTC (rev 2021)
@@ -0,0 +1 @@
+command.cfg
Modified: nagios-plugins/trunk/debian/nagios-plugins-standard.links
===================================================================
--- nagios-plugins/trunk/debian/nagios-plugins-standard.links 2012-03-06 15:21:23 UTC (rev 2020)
+++ nagios-plugins/trunk/debian/nagios-plugins-standard.links 2012-05-15 11:38:37 UTC (rev 2021)
@@ -1,10 +1,10 @@
-usr/share/doc/nagios-plugins-basic/NEWS.Debian.gz usr/share/doc/nagios-plugins-standard/NEWS.Debian.gz
-usr/share/doc/nagios-plugins-basic/README.Debian.gz usr/share/doc/nagios-plugins-standard/README.Debian.gz
-usr/share/doc/nagios-plugins-basic/changelog.gz usr/share/doc/nagios-plugins-standard/changelog.gz
-usr/share/doc/nagios-plugins-basic/examples usr/share/doc/nagios-plugins-standard/examples
-usr/share/doc/nagios-plugins-basic/FAQ usr/share/doc/nagios-plugins-standard/FAQ
-usr/share/doc/nagios-plugins-basic/NEWS.gz usr/share/doc/nagios-plugins-standard/NEWS.gz
-usr/share/doc/nagios-plugins-basic/README usr/share/doc/nagios-plugins-standard/README
-usr/share/doc/nagios-plugins-basic/LEGAL usr/share/doc/nagios-plugins-standard/LEGAL
-usr/share/doc/nagios-plugins-basic/REQUIREMENTS usr/share/doc/nagios-plugins-standard/REQUIREMENTS
-usr/share/doc/nagios-plugins-basic/SUPPORT usr/share/doc/nagios-plugins-standard/SUPPORT
+usr/share/doc/nagios-plugins-common/NEWS.Debian.gz usr/share/doc/nagios-plugins-standard/NEWS.Debian.gz
+usr/share/doc/nagios-plugins-common/README.Debian.gz usr/share/doc/nagios-plugins-standard/README.Debian.gz
+usr/share/doc/nagios-plugins-common/changelog.gz usr/share/doc/nagios-plugins-standard/changelog.gz
+usr/share/doc/nagios-plugins-common/examples usr/share/doc/nagios-plugins-standard/examples
+usr/share/doc/nagios-plugins-common/FAQ usr/share/doc/nagios-plugins-standard/FAQ
+usr/share/doc/nagios-plugins-common/NEWS.gz usr/share/doc/nagios-plugins-standard/NEWS.gz
+usr/share/doc/nagios-plugins-common/README usr/share/doc/nagios-plugins-standard/README
+usr/share/doc/nagios-plugins-common/LEGAL usr/share/doc/nagios-plugins-standard/LEGAL
+usr/share/doc/nagios-plugins-common/REQUIREMENTS usr/share/doc/nagios-plugins-standard/REQUIREMENTS
+usr/share/doc/nagios-plugins-common/SUPPORT usr/share/doc/nagios-plugins-standard/SUPPORT
Modified: nagios-plugins/trunk/debian/nagios-plugins.links
===================================================================
--- nagios-plugins/trunk/debian/nagios-plugins.links 2012-03-06 15:21:23 UTC (rev 2020)
+++ nagios-plugins/trunk/debian/nagios-plugins.links 2012-05-15 11:38:37 UTC (rev 2021)
@@ -1,11 +1,11 @@
-usr/share/doc/nagios-plugins-basic/NEWS.Debian.gz usr/share/doc/nagios-plugins/NEWS.Debian.gz
-usr/share/doc/nagios-plugins-basic/README.Debian.gz usr/share/doc/nagios-plugins/README.Debian.gz
+usr/share/doc/nagios-plugins-common/NEWS.Debian.gz usr/share/doc/nagios-plugins/NEWS.Debian.gz
+usr/share/doc/nagios-plugins-common/README.Debian.gz usr/share/doc/nagios-plugins/README.Debian.gz
usr/share/doc/nagios-plugins-standard/README.Debian.plugins usr/share/doc/nagios-plugins/README.Debian.plugins
-usr/share/doc/nagios-plugins-basic/changelog.gz usr/share/doc/nagios-plugins/changelog.gz
-usr/share/doc/nagios-plugins-basic/examples usr/share/doc/nagios-plugins/examples
-usr/share/doc/nagios-plugins-basic/FAQ usr/share/doc/nagios-plugins/FAQ
-usr/share/doc/nagios-plugins-basic/NEWS.gz usr/share/doc/nagios-plugins/NEWS.gz
-usr/share/doc/nagios-plugins-basic/README usr/share/doc/nagios-plugins/README
-usr/share/doc/nagios-plugins-basic/LEGAL usr/share/doc/nagios-plugins/LEGAL
-usr/share/doc/nagios-plugins-basic/REQUIREMENTS usr/share/doc/nagios-plugins/REQUIREMENTS
-usr/share/doc/nagios-plugins-basic/SUPPORT usr/share/doc/nagios-plugins/SUPPORT
+usr/share/doc/nagios-plugins-common/changelog.gz usr/share/doc/nagios-plugins/changelog.gz
+usr/share/doc/nagios-plugins-common/examples usr/share/doc/nagios-plugins/examples
+usr/share/doc/nagios-plugins-common/FAQ usr/share/doc/nagios-plugins/FAQ
+usr/share/doc/nagios-plugins-common/NEWS.gz usr/share/doc/nagios-plugins/NEWS.gz
+usr/share/doc/nagios-plugins-common/README usr/share/doc/nagios-plugins/README
+usr/share/doc/nagios-plugins-common/LEGAL usr/share/doc/nagios-plugins/LEGAL
+usr/share/doc/nagios-plugins-common/REQUIREMENTS usr/share/doc/nagios-plugins/REQUIREMENTS
+usr/share/doc/nagios-plugins-common/SUPPORT usr/share/doc/nagios-plugins/SUPPORT
Modified: nagios-plugins/trunk/debian/rules
===================================================================
--- nagios-plugins/trunk/debian/rules 2012-03-06 15:21:23 UTC (rev 2020)
+++ nagios-plugins/trunk/debian/rules 2012-05-15 11:38:37 UTC (rev 2021)
@@ -23,6 +23,7 @@
DEBIANDIR=$(CURDIR)/debian
NP_LIBEXEC:=/usr/lib/nagios/plugins
+NP_COMMON_DIR:=$(DEBIANDIR)/nagios-plugins-common
NP_BASIC_DIR:=$(DEBIANDIR)/nagios-plugins-basic
NP_BASIC_TEMPLATES:=$(NP_BASIC_DIR)/usr/share/nagios-plugins/templates-basic
NP_STD_DIR:=$(DEBIANDIR)/nagios-plugins-standard
@@ -35,6 +36,8 @@
check_mailq \
check_dns check_dig check_flexlm check_oracle
+common_files:=negate urlize utils.pm utils.sh
+
basic_plugin_cfgs:=apt dhcp disk dummy ftp http load mail news ntp ping procs \
real ssh tcp_udp telnet users
std_plugin_cfgs:=breeze disk-smb dns flexlm fping games hppjd ifstatus ldap \
@@ -151,6 +154,10 @@
for p in ${std_plugins}; do \
mv ${NP_BASIC_DIR}/${NP_LIBEXEC}/$$p ${NP_STD_DIR}/${NP_LIBEXEC}; \
done
+ # slit out common files
+ for p in ${common_files}; do \
+ mv ${NP_BASIC_DIR}/${NP_LIBEXEC}/$$p ${NP_COMMON_DIR}/${NP_LIBEXEC}; \
+ done
# now do the same for their configs, copying them into seperate
# "template" directories outside of /usr/share/doc for ucf to use.
for c in ${basic_plugin_cfgs}; do \
More information about the Pkg-nagios-changes
mailing list