[Pkg-nagios-changes] nagios changelog, 1.88, 1.89 control, 1.19, 1.20 nagios-common.dirs, 1.7, 1.8 nagios-mysql.dirs, 1.4, 1.5 nagios-pgsql.dirs, 1.4, 1.5 nagios-text.dirs, 1.3, 1.4 nagios.lintian-overrides, NONE, 1.1 rules, 1.23, 1.24

seanius at haydn.debian.org seanius at haydn.debian.org
Thu Dec 8 18:53:57 UTC 2005 

Update of /cvsroot/pkg-nagios/nagios
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv8807

Modified Files:
	changelog control nagios-common.dirs nagios-mysql.dirs 
	nagios-pgsql.dirs nagios-text.dirs rules 
Added Files:
	nagios.lintian-overrides 
Log Message:
okay, this is it

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/changelog,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- changelog	8 Dec 2005 15:15:41 -0000	1.88
+++ changelog	8 Dec 2005 18:53:54 -0000	1.89
@@ -22,8 +22,11 @@
   * allow the submit_check_result_via_nsca to take a cmdline paramter
     to specify destination host.  put a note about this in README.Debian
     too (closes: #342010).  thanks to Libor Klepac for the suggestions.
+  * we've had a nagios.8 manpage in our debian directory, but never
+    installed it... whoops :)
+  * various other lintian corrections and overrides.
 
- -- sean finney <seanius at debian.org>  Wed, 07 Dec 2005 21:24:26 +0100
+ -- sean finney <seanius at debian.org>  Thu, 08 Dec 2005 19:36:54 +0100
 
 nagios (2:1.3-cvs.20050402-10) unstable; urgency=low
 

Index: control
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/control,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- control	8 Dec 2005 13:12:23 -0000	1.19
+++ control	8 Dec 2005 18:53:54 -0000	1.20
@@ -34,7 +34,7 @@
 
 Package: nagios-text
 Architecture: any
-Depends: ${shlibs:Depends}, nagios-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, nagios-common (= ${Source-Version})
 Recommends: nagios-images
 Suggests: nagios-nrpe-plugin
 Conflicts: nagios
@@ -63,7 +63,7 @@
 
 Package: nagios-pgsql
 Architecture: any
-Depends: ${shlibs:Depends}, nagios-common (= ${Source-Version}), libdbd-pg-perl
+Depends: ${shlibs:Depends}, ${misc:Depends}, nagios-common (= ${Source-Version}), libdbd-pg-perl
 Recommends: nagios-images
 Suggests: nagios-nrpe-plugin
 Conflicts: nagios
@@ -92,7 +92,7 @@
 
 Package: nagios-mysql
 Architecture: any
-Depends: ${shlibs:Depends}, nagios-common (= ${Source-Version}), libdbd-mysql-perl
+Depends: ${shlibs:Depends}, ${misc:Depends}, nagios-common (= ${Source-Version}), libdbd-mysql-perl
 Recommends: nagios-images
 Suggests: nagios-nrpe-plugin
 Conflicts: nagios

Index: nagios-common.dirs
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.dirs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- nagios-common.dirs	8 Dec 2005 13:12:23 -0000	1.7
+++ nagios-common.dirs	8 Dec 2005 18:53:54 -0000	1.8
@@ -16,3 +16,4 @@
 usr/share/nagios/htdocs/ssi
 usr/share/nagios/debian
 usr/lib/nagios/plugins
+usr/share/lintian/overrides/

Index: nagios-mysql.dirs
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-mysql.dirs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- nagios-mysql.dirs	8 Dec 2005 13:12:23 -0000	1.4
+++ nagios-mysql.dirs	8 Dec 2005 18:53:54 -0000	1.5
@@ -1,3 +1,4 @@
 usr/sbin
 usr/lib/cgi-bin/nagios
 usr/share/dbconfig-common/data/nagios-mysql/install
+usr/share/lintian/overrides

Index: nagios-pgsql.dirs
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-pgsql.dirs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- nagios-pgsql.dirs	8 Dec 2005 13:12:23 -0000	1.4
+++ nagios-pgsql.dirs	8 Dec 2005 18:53:54 -0000	1.5
@@ -1,3 +1,4 @@
 usr/sbin
 usr/lib/cgi-bin/nagios
 usr/share/dbconfig-common/data/nagios-pgsql/install
+usr/share/lintian/overrides

Index: nagios-text.dirs
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-text.dirs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- nagios-text.dirs	7 Nov 2004 23:18:46 -0000	1.3
+++ nagios-text.dirs	8 Dec 2005 18:53:54 -0000	1.4
@@ -1,2 +1,3 @@
 usr/sbin
 usr/lib/cgi-bin/nagios
+usr/share/lintian/overrides

--- NEW FILE: nagios.lintian-overrides ---
# the following file contains sensitive data so needs non-standard permissions
nagios-common binary: non-standard-file-perm etc/nagios/resource.cfg 0660 != 0644
# the manpage is provided by the depended-upon nagios-common package
nagios-text binary: binary-without-manpage nagios
nagios-mysql binary: binary-without-manpage nagios
nagios-pgsql binary: binary-without-manpage nagios
# the init script is provided by the depended-upon nagios-common package
nagios-text binary: init.d-script-not-marked-as-conffile /etc/init.d/nagios
nagios-text binary: init.d-script-not-included-in-package /etc/init.d/nagios
nagios-mysql binary: init.d-script-not-marked-as-conffile /etc/init.d/nagios
nagios-mysql binary: init.d-script-not-included-in-package /etc/init.d/nagios
nagios-pgsql binary: init.d-script-not-marked-as-conffile /etc/init.d/nagios
nagios-pgsql binary: init.d-script-not-included-in-package /etc/init.d/nagios
# and the update-rc.d stuff is also handled by said -common package
nagios-text binary: postrm-does-not-call-updaterc.d-for-init.d-script /etc/init.d/nagios
nagios-mysql binary: postrm-does-not-call-updaterc.d-for-init.d-script /etc/init.d/nagios
nagios-pgsql binary: postrm-does-not-call-updaterc.d-for-init.d-script /etc/init.d/nagios
# the binary packages use dbconfig-common, but do not have other debconf
# templates so these warnings are useless
nagios-text binary: no-debconf-templates
nagios-mysql binary: no-debconf-templates
nagios-pgsql binary: no-debconf-templates
# likewise, since they don't have questions of our own, we don't need to purge
nagios-text binary: postrm-does-not-purge-debconf
nagios-mysql binary: postrm-does-not-purge-debconf
nagios-pgsql binary: postrm-does-not-purge-debconf

Index: rules
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/rules,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- rules	8 Dec 2005 14:33:42 -0000	1.23
+++ rules	8 Dec 2005 18:53:54 -0000	1.24
@@ -148,6 +148,7 @@
 nagios-text:
 	@echo "--- Building: $@"
 	dh_installdirs 		 -p$@ -P$(b)/$@ 
+	install -m 644 debian/nagios.lintian-overrides debian/$@/usr/share/lintian/overrides/$@
 	/usr/bin/install -m 774 base/nagios.text debian/$@/usr/sbin/nagios
 	for bin in $(CGIBINS); do \
 		/usr/bin/install -m 755 cgi/$$bin.cgi.text debian/$@/usr/lib/cgi-bin/nagios/$$bin.cgi; \
@@ -167,6 +168,7 @@
 nagios-mysql:
 	@echo "--- Building: $@"
 	dh_installdirs 		 -p$@ -P$(b)/$@ 
+	install -m 644 debian/nagios.lintian-overrides debian/$@/usr/share/lintian/overrides/$@
 	/usr/bin/install -m 774 base/nagios.mysql debian/$@/usr/sbin/nagios
 	for bin in $(CGIBINS); do \
 		/usr/bin/install -m 755 cgi/$$bin.cgi.mysql debian/$@/usr/lib/cgi-bin/nagios/$$bin.cgi; \
@@ -187,6 +189,7 @@
 nagios-pgsql:
 	@echo "--- Building: $@"
 	dh_installdirs 		 -p$@ -P$(b)/$@ 
+	install -m 644 debian/nagios.lintian-overrides debian/$@/usr/share/lintian/overrides/$@
 	/usr/bin/install -m 774 base/nagios.pgsql debian/$@/usr/sbin/nagios
 	for bin in $(CGIBINS); do \
 		/usr/bin/install -m 755 cgi/$$bin.cgi.pgsql debian/$@/usr/lib/cgi-bin/nagios/$$bin.cgi; \
@@ -209,6 +212,7 @@
 	dh_installdirs 		 -p$@ -P$(b)/$@ 
 	dh_installdocs       -p$@ -P$(b)/$@
 	dh_installexamples   -p$@ -P$(b)/$@
+	install -m 644 debian/nagios.lintian-overrides debian/$@/usr/share/lintian/overrides/$@
 	(cd $(b) && for file in `find . -name '*.cfg.in'`; do \
 					rm -f $$file; \
 				done; \
@@ -217,13 +221,13 @@
 	dh_installchangelogs -p$@ -P$(b)/$@ Changelog
 	dh_installinit 	     -p$@ -P$(b)/$@ --no-start --name nagios -- defaults 30 18
 	dh_install           -p$@ -P$(b)/$@
+	dh_installman        -p$@ debian/nagios.8
 	chmod +x $(maindir)/debian/nagios-common/usr/lib/nagios/plugins/check-imap
 	chmod +x $(maindir)/debian/nagios-common/usr/lib/nagios/plugins/check_nagios_db
 	chmod +x $(maindir)/debian/nagios-common/usr/lib/cgi-bin/nagios/traceroute.cgi
 	chmod 660 $(maindir)/debian/nagios-common/etc/nagios/resource.cfg
 	rm -f $(maindir)/debian/nagios-common/etc/nagios/hosts.cfg
 	rm -f $(maindir)/debian/nagios-common/etc/nagios/cgi.cfg
-
 	dh_link              -p$@ -P$(b)/$@ usr/share/nagios-common/htdocs/docs usr/share/doc/nagios-common/html
 	dh_strip             -p$@ -P$(b)/$@
 	dh_compress          -p$@ -P$(b)/$@ -Xcreate_mysql -Xcreate_pgsql

More information about the Pkg-nagios-changes mailing list