[Pkg-nagios-devel] nagios check-imap,NONE,1.1 nagios-text.install,NONE,1.1 changelog,1.4,1.5 nagios-mysql.install,1.1,1.2 nagios-pgsql.install,1.1,1.2 rules,1.4,1.5 check-imap.sh,1.1.1.1,NONE install,1.1,NONE
joerg@haydn.debian.org
joerg@haydn.debian.org
Update of /cvsroot/pkg-nagios/nagios
In directory haydn:/tmp/cvs-serv16466
Modified Files:
changelog nagios-mysql.install nagios-pgsql.install rules
Added Files:
check-imap nagios-text.install
Removed Files:
check-imap.sh install
Log Message:
Renamed check-imap.sh to its actual name in the package: check-imap.
Moved some other stuff from install: to the nagios-{text,mysql,pgsql}.install
files. First created the nagios-text.install file and removed the now obsolete
install file.
--- NEW FILE: check-imap ---
#!/bin/sh
# This is a wrapper, don't use this in your configuration,
# choose /usr/lib/nagios/plugins/check_imap instead!
/usr/lib/nagios/plugins/check_imap "$*"
--- NEW FILE: nagios-text.install ---
contrib/eventhandlers/* nagios-text/usr/lib/nagios/plugins/eventhandlers
debian/apache.conf etc/nagios/
debian/update-nagios nagios-text/usr/sbin/
debian/upgrade-netsaint2nagios nagios-text/usr/sbin/
debian/command.cfg nagios-text/etc/nagios/
debian/check-imap nagios-text/usr/lib/nagios/plugins
Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/changelog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- changelog 1 Nov 2004 02:51:20 -0000 1.4
+++ changelog 1 Nov 2004 23:05:14 -0000 1.5
@@ -13,6 +13,9 @@
he forgot all the other things where it is mentioned. And var/run fits
better IMO).
- Change debian/rules, first half is done, but still needs some work.
+ - Try to clean the install-stamp: target a bit and do more things with
+ dh_install, to get a more readable rules file.
+ - Rename check_imap.sh to check_imap
* Sean Finney:
- added danish and catalan debconf translations. thanks go to
Claus Hindsgaul and Aleix Badia i Bosch respectively.
Index: nagios-mysql.install
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-mysql.install,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nagios-mysql.install 31 Oct 2004 22:00:08 -0000 1.1
+++ nagios-mysql.install 1 Nov 2004 23:05:14 -0000 1.2
@@ -1,3 +1,8 @@
debian/README.mysql usr/share/doc/nagios-mysql/
contrib/database/create_mysql usr/share/doc/nagios-mysql/
debian/apache.conf etc/nagios/
+contrib/eventhandlers/* nagios-mysql/usr/lib/nagios/plugins/eventhandlers/
+debian/update-nagios nagios-mysql/usr/sbin/
+debian/upgrade-netsaint2nagios nagios-mysql/usr/sbin/
+debian/command.cfg nagios-mysql/etc/nagios/
+debian/check-imap nagios-mysql/usr/lib/nagios/plugins/
Index: nagios-pgsql.install
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-pgsql.install,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nagios-pgsql.install 31 Oct 2004 22:00:08 -0000 1.1
+++ nagios-pgsql.install 1 Nov 2004 23:05:14 -0000 1.2
@@ -1,2 +1,7 @@
contrib/database/create_pgsql usr/share/doc/nagios-pgsql/
debian/apache.conf etc/nagios/
+contrib/eventhandlers/* nagios-pgsql/usr/lib/nagios/plugins/eventhandlers
+debian/update-nagios nagios-pgsql/usr/sbin/
+debian/upgrade-netsaint2nagios nagios-pgsql/usr/sbin/
+debian/command.cfg nagios-pgsql/etc/nagios/
+debian/check-imap nagios-pgsql/usr/lib/nagios/plugins/
Index: rules
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/rules,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rules 1 Nov 2004 02:51:20 -0000 1.4
+++ rules 1 Nov 2004 23:05:14 -0000 1.5
@@ -56,7 +56,7 @@
-make distclean
-rm -Rf {cgi,base}/*.mysql {cgi,base}/*.pgsql {cgi,base}/*.text
-rm {patch,patch-no-defaults,install,configure,build}-stamp
- -rm debian/templates.merged
+ -rm debian/templates.merged subst
-rm debian/nagios-{text,mysql,pgsql}.nagios.init
dh_clean
@@ -134,7 +134,6 @@
done
dh_installinit -a --name nagios
-
build: build-stamp
build-stamp: patch binary-nagios-text binary-nagios-pgsql binary-nagios-mysql
@@ -230,7 +229,6 @@
INSTALL_OPTS= COMMAND_OPTS= && echo $?; \
install -m 755 base/nagios.$$dir $(maindir)/debian/nagios-$$dir/usr/lib/cgi-bin/nagios/nagios; \
install -m 755 contrib/traceroute.cgi $(maindir)/debian/nagios-$$dir/usr/lib/cgi-bin/nagios/; \
- cp -r contrib/eventhandlers/* $(maindir)/debian/nagios-$$dir/usr/lib/nagios/plugins/eventhandlers; \
cat sample-config/nagios.cfg | \
sh $(maindir)/debian/scripts/addpluginseg | \
sed -e 's@command_file=/var/log@command_file=/var/cache@' \
@@ -243,10 +241,6 @@
sed -e "s@^#authorized_for_\(.*\)=.*@authorized_for_\1=nagiosadmin@" \
> $(maindir)/debian/nagios-$$dir/etc/nagios/cgi.cfg.new; \
cd $(maindir)/debian/; \
- install -m 755 update-nagios $(maindir)/debian/nagios-$$dir/usr/sbin/; \
- install -m 755 upgrade-netsaint2nagios $(maindir)/debian/nagios-$$dir/usr/sbin/; \
- cp command.cfg $(maindir)/debian/nagios-$$dir/etc/nagios/; \
- cp check-imap.sh $(maindir)/debian/nagios-$$dir/usr/lib/nagios/plugins/check-imap; \
chmod +x nagios-$$dir/usr/lib/nagios/plugins/check-imap; \
cd $(maindir)/debian/nagios-$$dir/etc/nagios; \
mv nagios.cfg.new nagios.cfg; \
--- check-imap.sh DELETED ---
--- install DELETED ---