[Pkg-nagios-devel] nagios nagios-mysql.install,1.2,1.3 nagios-pgsql.install,1.2,1.3 nagios-text.install,1.1,1.2 rules,1.5,1.6
joerg@haydn.debian.org
joerg@haydn.debian.org
Update of /cvsroot/pkg-nagios/nagios
In directory haydn:/tmp/cvs-serv21580
Modified Files:
nagios-mysql.install nagios-pgsql.install nagios-text.install
rules
Log Message:
Some small fixes to get it build again. Build works.
Next step (i start now) is to split a -common package.
Index: nagios-mysql.install
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-mysql.install,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nagios-mysql.install 1 Nov 2004 23:05:14 -0000 1.2
+++ nagios-mysql.install 3 Nov 2004 22:32:03 -0000 1.3
@@ -1,8 +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/
+contrib/eventhandlers/* usr/lib/nagios/plugins/eventhandlers/
+debian/update-nagios usr/sbin/
+debian/upgrade-netsaint2nagios usr/sbin/
+debian/command.cfg etc/nagios/
+debian/check-imap usr/lib/nagios/plugins/
Index: nagios-pgsql.install
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-pgsql.install,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nagios-pgsql.install 1 Nov 2004 23:05:14 -0000 1.2
+++ nagios-pgsql.install 3 Nov 2004 22:32:03 -0000 1.3
@@ -1,7 +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/
+contrib/eventhandlers/* usr/lib/nagios/plugins/eventhandlers
+debian/update-nagios usr/sbin/
+debian/upgrade-netsaint2nagios usr/sbin/
+debian/command.cfg etc/nagios/
+debian/check-imap usr/lib/nagios/plugins/
Index: nagios-text.install
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-text.install,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nagios-text.install 1 Nov 2004 23:05:14 -0000 1.1
+++ nagios-text.install 3 Nov 2004 22:32:03 -0000 1.2
@@ -1,6 +1,6 @@
-contrib/eventhandlers/* nagios-text/usr/lib/nagios/plugins/eventhandlers
+contrib/eventhandlers/* 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
+debian/update-nagios usr/sbin/
+debian/upgrade-netsaint2nagios usr/sbin/
+debian/command.cfg etc/nagios/
+debian/check-imap usr/lib/nagios/plugins
Index: rules
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/rules,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rules 1 Nov 2004 23:05:14 -0000 1.5
+++ rules 3 Nov 2004 22:32:03 -0000 1.6
@@ -128,7 +128,7 @@
touch binary-nagios-mysql-stamp
binary-indep:
- # install the same initscript in each package dir
+# install the same initscript in each package dir
for pkg in text pgsql mysql; do \
cp debian/init.d debian/nagios-$$pkg.nagios.init; \
done
@@ -154,6 +154,7 @@
dh_installdocs -p$@ -P$(b)/$@
dh_installchangelogs -p$@ -P$(b)/$@ Changelog
dh_install -p$@ -P$(b)/$@
+ chmod +x $(maindir)/debian/nagios-text/usr/lib/nagios/plugins/check-imap;
dh_strip -p$@ -P$(b)/$@
dh_installexamples -p$@ -P$(b)/$@
dh_compress -p$@ -P$(b)/$@
@@ -173,6 +174,7 @@
dh_installdocs -p$@ -P$(b)/$@
dh_installchangelogs -p$@ -P$(b)/$@ Changelog
dh_install -p$@ -P$(b)/$@
+ chmod +x $(maindir)/debian/nagios-mysql/usr/lib/nagios/plugins/check-imap;
dh_strip -p$@ -P$(b)/$@
dh_installexamples -p$@ -P$(b)/$@
dh_compress -p$@ -P$(b)/$@
@@ -192,6 +194,7 @@
dh_installdocs -p$@ -P$(b)/$@
dh_installchangelogs -p$@ -P$(b)/$@ Changelog
dh_install -p$@ -P$(b)/$@
+ chmod +x $(maindir)/debian/nagios-pgsql/usr/lib/nagios/plugins/check-imap;
dh_strip -p$@ -P$(b)/$@
dh_installexamples -p$@ -P$(b)/$@
dh_compress -p$@ -P$(b)/$@
@@ -240,8 +243,6 @@
cat sample-config/cgi.cfg | \
sed -e "s@^#authorized_for_\(.*\)=.*@authorized_for_\1=nagiosadmin@" \
> $(maindir)/debian/nagios-$$dir/etc/nagios/cgi.cfg.new; \
- cd $(maindir)/debian/; \
- chmod +x nagios-$$dir/usr/lib/nagios/plugins/check-imap; \
cd $(maindir)/debian/nagios-$$dir/etc/nagios; \
mv nagios.cfg.new nagios.cfg; \
mv cgi.cfg.new cgi.cfg; \