[Pkg-nagios-changes] [pkg-monitoring-plugins] 08/51: Fixing pathes in debian/rules and maintainers scripts
Jan Wagner
waja at moszumanska.debian.org
Mon Jul 7 14:36:21 UTC 2014
This is an automated email from the git hooks/post-receive script.
waja pushed a commit to branch master
in repository pkg-monitoring-plugins.
commit fb6d01c2e23b7953118837f21066d1d6051e3650
Author: Jan Wagner <waja at cyconet.org>
Date: Thu Jan 23 01:38:10 2014 +0100
Fixing pathes in debian/rules and maintainers scripts
---
debian/monitoring-plugins-basic.dirs | 2 +-
debian/monitoring-plugins-basic.links | 20 ++++++------
debian/monitoring-plugins-basic.postinst | 4 +--
debian/monitoring-plugins-standard.dirs | 2 +-
debian/monitoring-plugins-standard.links | 20 ++++++------
debian/monitoring-plugins-standard.postinst | 4 +--
debian/monitoring-plugins.links | 22 ++++++-------
debian/rules | 48 ++++++++++++++---------------
8 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/debian/monitoring-plugins-basic.dirs b/debian/monitoring-plugins-basic.dirs
index a3f3c40..36d64bf 100644
--- a/debian/monitoring-plugins-basic.dirs
+++ b/debian/monitoring-plugins-basic.dirs
@@ -1,3 +1,3 @@
usr/lib/nagios/plugins
etc/nagios-plugins/config
-usr/share/nagios-plugins/templates-basic
+usr/share/monitoring-plugins/templates-basic
diff --git a/debian/monitoring-plugins-basic.links b/debian/monitoring-plugins-basic.links
index 6b43093..d6ae606 100644
--- a/debian/monitoring-plugins-basic.links
+++ b/debian/monitoring-plugins-basic.links
@@ -1,10 +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
+usr/share/doc/monitoring-plugins-common/NEWS.Debian.gz usr/share/doc/monitoring-plugins-basic/NEWS.Debian.gz
+usr/share/doc/monitoring-plugins-common/README.Debian.gz usr/share/doc/monitoring-plugins-basic/README.Debian.gz
+usr/share/doc/monitoring-plugins-common/changelog.gz usr/share/doc/monitoring-plugins-basic/changelog.gz
+usr/share/doc/monitoring-plugins-common/examples usr/share/doc/monitoring-plugins-basic/examples
+usr/share/doc/monitoring-plugins-common/FAQ usr/share/doc/monitoring-plugins-basic/FAQ
+usr/share/doc/monitoring-plugins-common/NEWS.gz usr/share/doc/monitoring-plugins-basic/NEWS.gz
+usr/share/doc/monitoring-plugins-common/README usr/share/doc/monitoring-plugins-basic/README
+usr/share/doc/monitoring-plugins-common/LEGAL usr/share/doc/monitoring-plugins-basic/LEGAL
+usr/share/doc/monitoring-plugins-common/REQUIREMENTS usr/share/doc/monitoring-plugins-basic/REQUIREMENTS
+usr/share/doc/monitoring-plugins-common/SUPPORT usr/share/doc/monitoring-plugins-basic/SUPPORT
diff --git a/debian/monitoring-plugins-basic.postinst b/debian/monitoring-plugins-basic.postinst
index bb212a0..75bde3e 100644
--- a/debian/monitoring-plugins-basic.postinst
+++ b/debian/monitoring-plugins-basic.postinst
@@ -1,7 +1,7 @@
#!/bin/sh -e
-templdir=/usr/share/nagios-plugins/templates-basic
-. /usr/share/nagios-plugins/dpkg/functions
+templdir=/usr/share/monitoring-plugins/templates-basic
+. /usr/share/monitoring-plugins/dpkg/functions
if [ "$1" = "configure" ]; then
register_cfgs $2
diff --git a/debian/monitoring-plugins-standard.dirs b/debian/monitoring-plugins-standard.dirs
index 1890d3b..ac415a3 100644
--- a/debian/monitoring-plugins-standard.dirs
+++ b/debian/monitoring-plugins-standard.dirs
@@ -1,3 +1,3 @@
usr/lib/nagios/plugins
etc/nagios-plugins/config
-usr/share/nagios-plugins/templates-standard
+usr/share/monitoring-plugins/templates-standard
diff --git a/debian/monitoring-plugins-standard.links b/debian/monitoring-plugins-standard.links
index 68c25cd..581032d 100644
--- a/debian/monitoring-plugins-standard.links
+++ b/debian/monitoring-plugins-standard.links
@@ -1,10 +1,10 @@
-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
+usr/share/doc/monitoring-plugins-common/NEWS.Debian.gz usr/share/doc/monitoring-plugins-standard/NEWS.Debian.gz
+usr/share/doc/monitoring-plugins-common/README.Debian.gz usr/share/doc/monitoring-plugins-standard/README.Debian.gz
+usr/share/doc/monitoring-plugins-common/changelog.gz usr/share/doc/monitoring-plugins-standard/changelog.gz
+usr/share/doc/monitoring-plugins-common/examples usr/share/doc/monitoring-plugins-standard/examples
+usr/share/doc/monitoring-plugins-common/FAQ usr/share/doc/monitoring-plugins-standard/FAQ
+usr/share/doc/monitoring-plugins-common/NEWS.gz usr/share/doc/monitoring-plugins-standard/NEWS.gz
+usr/share/doc/monitoring-plugins-common/README usr/share/doc/monitoring-plugins-standard/README
+usr/share/doc/monitoring-plugins-common/LEGAL usr/share/doc/monitoring-plugins-standard/LEGAL
+usr/share/doc/monitoring-plugins-common/REQUIREMENTS usr/share/doc/monitoring-plugins-standard/REQUIREMENTS
+usr/share/doc/monitoring-plugins-common/SUPPORT usr/share/doc/monitoring-plugins-standard/SUPPORT
diff --git a/debian/monitoring-plugins-standard.postinst b/debian/monitoring-plugins-standard.postinst
index 6a6b13f..8cf6b95 100644
--- a/debian/monitoring-plugins-standard.postinst
+++ b/debian/monitoring-plugins-standard.postinst
@@ -1,7 +1,7 @@
#!/bin/sh -e
-. /usr/share/nagios-plugins/dpkg/functions
-templdir=/usr/share/nagios-plugins/templates-standard
+. /usr/share/monitoring-plugins/dpkg/functions
+templdir=/usr/share/monitoring-plugins/templates-standard
if [ "$1" = "configure" ]; then
register_cfgs $2
diff --git a/debian/monitoring-plugins.links b/debian/monitoring-plugins.links
index 7b14159..ae9f2cc 100644
--- a/debian/monitoring-plugins.links
+++ b/debian/monitoring-plugins.links
@@ -1,11 +1,11 @@
-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-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
+usr/share/doc/monitoring-plugins-common/NEWS.Debian.gz usr/share/doc/monitoring-plugins/NEWS.Debian.gz
+usr/share/doc/monitoring-plugins-common/README.Debian.gz usr/share/doc/monitoring-plugins/README.Debian.gz
+usr/share/doc/monitoring-plugins-standard/README.Debian.plugins usr/share/doc/monitoring-plugins/README.Debian.plugins
+usr/share/doc/monitoring-plugins-common/changelog.gz usr/share/doc/monitoring-plugins/changelog.gz
+usr/share/doc/monitoring-plugins-common/examples usr/share/doc/monitoring-plugins/examples
+usr/share/doc/monitoring-plugins-common/FAQ usr/share/doc/monitoring-plugins/FAQ
+usr/share/doc/monitoring-plugins-common/NEWS.gz usr/share/doc/monitoring-plugins/NEWS.gz
+usr/share/doc/monitoring-plugins-common/README usr/share/doc/monitoring-plugins/README
+usr/share/doc/monitoring-plugins-common/LEGAL usr/share/doc/monitoring-plugins/LEGAL
+usr/share/doc/monitoring-plugins-common/REQUIREMENTS usr/share/doc/monitoring-plugins/REQUIREMENTS
+usr/share/doc/monitoring-plugins-common/SUPPORT usr/share/doc/monitoring-plugins/SUPPORT
diff --git a/debian/rules b/debian/rules
index df45a98..1f55463 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@
# enable hardnening
export DEB_BUILD_HARDENING=1
-PACKAGE = nagios-plugins
+PACKAGE = monitoring-plugins
include /usr/share/dpatch/dpatch.make
@@ -23,11 +23,11 @@ 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
-NP_STD_TEMPLATES:=$(NP_STD_DIR)/usr/share/nagios-plugins/templates-standard
+NP_COMMON_DIR:=$(DEBIANDIR)/monitoring-plugins-common
+NP_BASIC_DIR:=$(DEBIANDIR)/monitoring-plugins-basic
+NP_BASIC_TEMPLATES:=$(NP_BASIC_DIR)/usr/share/monitoring-plugins/templates-basic
+NP_STD_DIR:=$(DEBIANDIR)/monitoring-plugins-standard
+NP_STD_TEMPLATES:=$(NP_STD_DIR)/usr/share/monitoring-plugins/templates-standard
std_plugins:=check_breeze check_ifoperstatus check_hpjd check_ifstatus \
check_rpc check_snmp check_wave check_fping check_game \
@@ -72,7 +72,7 @@ config.status: configure
# if /proc is not mounted, check_nagios and check_procs are
# silently omitted from build.
@if ! [ -d /proc/1 ]; then \
- echo "nagios-plugins needs a mounted /proc to correctly build"; \
+ echo "monitoring-plugins needs a mounted /proc to correctly build"; \
exit 1; \
fi
@@ -131,7 +131,7 @@ clean: really-clean unpatch
really-clean:
dh_testdir
dh_testroot
- rm -f build-stamp debian/README.Debian.plugins debian/nagios-plugins-standard.substvars.in
+ rm -f build-stamp debian/README.Debian.plugins debian/monitoring-plugins-standard.substvars.in
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
@@ -139,7 +139,7 @@ really-clean:
-rm -f platform.h auto-include.h
find -type d -name build -print0 | xargs -0 -r rm -rf \;
find \( -name config.sub -o -name config.guess \) -print0 | xargs -0 -r rm -f \;
- -rm -f $(DEBIANDIR)/nagios-plugins-basic.postrm $(DEBIANDIR)/nagios-plugins-standard.postrm
+ -rm -f $(DEBIANDIR)/monitoring-plugins-basic.postrm $(DEBIANDIR)/monitoring-plugins-standard.postrm
dh_clean
install: build
@@ -148,7 +148,7 @@ install: build
dh_clean -k
dh_installdirs
- # Add here commands to install the package into debian/nagios-plugins.
+ # Add here commands to install the package into debian/monitoring-plugins.
$(MAKE) install DESTDIR=${NP_BASIC_DIR}
$(MAKE) install-root DESTDIR=${NP_BASIC_DIR}
chmod 644 ${NP_BASIC_DIR}/usr/lib/nagios/plugins/utils.pm
@@ -171,16 +171,16 @@ install: build
# dynamically create the postrm scripts using a template, so that we
# don't have to define the same list of plugin configs over and over.
sed -e 's/@BASIC_PLUGINS@/${basic_plugin_cfgs}/' \
- < $(DEBIANDIR)/nagios-plugins-basic.postrm.in \
- > $(DEBIANDIR)/nagios-plugins-basic.postrm
+ < $(DEBIANDIR)/monitoring-plugins-basic.postrm.in \
+ > $(DEBIANDIR)/monitoring-plugins-basic.postrm
sed -e 's/@STD_PLUGINS@/${std_plugin_cfgs}/' \
- < $(DEBIANDIR)/nagios-plugins-standard.postrm.in \
- > $(DEBIANDIR)/nagios-plugins-standard.postrm
+ < $(DEBIANDIR)/monitoring-plugins-standard.postrm.in \
+ > $(DEBIANDIR)/monitoring-plugins-standard.postrm
# copy our dpkg-sourced functions etc into place
- mkdir -p ${NP_COMMON_DIR}/usr/share/nagios-plugins/dpkg
- install -t ${NP_COMMON_DIR}/usr/share/nagios-plugins/dpkg \
+ mkdir -p ${NP_COMMON_DIR}/usr/share/monitoring-plugins/dpkg
+ install -t ${NP_COMMON_DIR}/usr/share/monitoring-plugins/dpkg \
$(DEBIANDIR)/functions
- # remove /usr/include from nagios-plugins-basic (in case its empty and exists)
+ # remove /usr/include from monitoring-plugins-basic (in case its empty and exists)
[ ! -d ${NP_BASIC_DIR}/usr/include ] || rmdir ${NP_BASIC_DIR}/usr/include
# generate debian/README.Debian.plugins
perl ./debian/bin/gen_plugin_deps.pl
@@ -205,8 +205,8 @@ binary-indep: build install
binary-arch: build install
dh_testdir -s
dh_testroot -s
- dh_installchangelogs -p nagios-plugins-basic -s ChangeLog
- dh_installchangelogs -Nnagios-plugins-basic
+ dh_installchangelogs -p monitoring-plugins-basic -s ChangeLog
+ dh_installchangelogs -Nmonitoring-plugins-basic
dh_installdocs -s
dh_link -s
dh_installexamples -s
@@ -215,14 +215,14 @@ binary-arch: build install
dh_compress -s
dh_fixperms -s -X utils.pm
dh_installdeb -s
- dh_shlibdeps -s -Nnagios-plugins-standard
- dpkg-shlibdeps -Tdebian/nagios-plugins-standard.substvars \
+ dh_shlibdeps -s -Nmonitoring-plugins-standard
+ dpkg-shlibdeps -Tdebian/monitoring-plugins-standard.substvars \
${NP_STD_DIR}/${NP_LIBEXEC}/check_dns
- dpkg-shlibdeps -Tdebian/nagios-plugins-standard.substvars.in \
+ dpkg-shlibdeps -Tdebian/monitoring-plugins-standard.substvars.in \
-dSuggests ${NP_STD_DIR}/${NP_LIBEXEC}/check_*
- grep shlibs:Suggests debian/nagios-plugins-standard.substvars.in \
+ grep shlibs:Suggests debian/monitoring-plugins-standard.substvars.in \
| sed -e 's/shlibs:Suggests/shlibs:Recommends/' \
- >> debian/nagios-plugins-standard.substvars
+ >> debian/monitoring-plugins-standard.substvars
dh_gencontrol -s -- $(DEPSUBSTVARS)
dh_md5sums -s
dh_builddeb -s
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-monitoring-plugins.git
More information about the Pkg-nagios-changes
mailing list