[Pkg-nagios-changes] [pkg-nagios-plugins] 298/413: create nagios-plugins-common package
Jan Wagner
waja at moszumanska.debian.org
Tue Nov 26 23:13:34 UTC 2013
This is an automated email from the git hooks/post-receive script.
waja pushed a commit to branch master
in repository pkg-nagios-plugins.
commit e6b4a0267d5aa191ab1f3f6d305006f7763ba2b0
Author: Jan Wagner <waja at cyconet.org>
Date: Tue May 15 11:38:37 2012 +0000
create nagios-plugins-common package
---
debian/changelog | 2 ++
debian/control | 13 ++++++++++++-
debian/nagios-plugins-basic.links | 10 ++++++++++
debian/nagios-plugins-common.dirs | 1 +
...plugins-basic.docs => nagios-plugins-common.docs} | 0
...basic.examples => nagios-plugins-common.examples} | 0
debian/nagios-plugins-standard.links | 20 ++++++++++----------
debian/nagios-plugins.links | 20 ++++++++++----------
debian/rules | 7 +++++++
9 files changed, 52 insertions(+), 21 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 539a096..6df3730 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/control b/debian/control
index cff0f67..4fa121f 100644
--- a/debian/control
+++ b/debian/control
@@ -21,9 +21,20 @@ Description: Plugins for nagios compatible monitoring systems (metapackage)
(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
diff --git a/debian/nagios-plugins-basic.links b/debian/nagios-plugins-basic.links
new file mode 100644
index 0000000..6b43093
--- /dev/null
+++ b/debian/nagios-plugins-basic.links
@@ -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
diff --git a/debian/nagios-plugins-common.dirs b/debian/nagios-plugins-common.dirs
new file mode 100644
index 0000000..4390481
--- /dev/null
+++ b/debian/nagios-plugins-common.dirs
@@ -0,0 +1 @@
+usr/lib/nagios/plugins
\ No newline at end of file
diff --git a/debian/nagios-plugins-basic.docs b/debian/nagios-plugins-common.docs
similarity index 100%
rename from debian/nagios-plugins-basic.docs
rename to debian/nagios-plugins-common.docs
diff --git a/debian/nagios-plugins-basic.examples b/debian/nagios-plugins-common.examples
similarity index 100%
rename from debian/nagios-plugins-basic.examples
rename to debian/nagios-plugins-common.examples
diff --git a/debian/nagios-plugins-standard.links b/debian/nagios-plugins-standard.links
index 93ec47b..68c25cd 100644
--- a/debian/nagios-plugins-standard.links
+++ b/debian/nagios-plugins-standard.links
@@ -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
diff --git a/debian/nagios-plugins.links b/debian/nagios-plugins.links
index dc3bc63..7b14159 100644
--- a/debian/nagios-plugins.links
+++ b/debian/nagios-plugins.links
@@ -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
diff --git a/debian/rules b/debian/rules
index 8bf5d8e..45c2eba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ CFLAGS = -Wall -g
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 @@ std_plugins:=check_breeze check_ifoperstatus check_hpjd check_ifstatus \
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 @@ install: build
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 \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-plugins.git
More information about the Pkg-nagios-changes
mailing list