[Pkg-nagios-devel] nagios changelog, 1.77, 1.78 control, 1.14, 1.15 rules, 1.20, 1.21

[seanius at haydn.debian.org]

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

Modified Files:
	changelog control rules 
Log Message:
dependency change, now use --with-default-perfdata instead of --with-file-perfdata

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/changelog,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- changelog	5 Oct 2005 07:26:13 -0000	1.77
+++ changelog	16 Oct 2005 18:23:32 -0000	1.78
@@ -1,9 +1,20 @@
-nagios (2:1.3-cvs.20050402-7) UNRELEASED; urgency=low
+nagios (2:1.3-cvs.20050402-7) unstable; urgency=low
 
   * Sean Finney:
+    - update dependencies to reflect future nagios-plugins layout.  
+      people who only want a basic set of plugins should install
+      nagios-plugins-base.  keep an eye on the nagios-plugins package
+      in the next few weeks to see when this will be available.
+    - now compiling with --with-default-perfdata instead of 
+      --with-file-perfdata, as that seems to be a superior option.  see
+      the updated config file for how to get back the old behavior.  thanks
+      to john stile for pointing this out (closes: #332722).
+    - removed circular dependency on nagios.  nagios-common doesn't really
+      depend on having a nagios-server around, it's only the opposite that's
+      true.
     - new swedish debconf translations from daniel nylander (closes: #331181).
 
- -- sean finney <seanius at debian.org>  Wed, 05 Oct 2005 09:24:51 +0200
+ -- sean finney <seanius at debian.org>  Sun, 16 Oct 2005 14:20:50 -0400
 
 nagios (2:1.3-cvs.20050402-6) unstable; urgency=low
 

Index: control
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/control,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- control	24 Sep 2005 12:56:40 -0000	1.14
+++ control	16 Oct 2005 18:23:33 -0000	1.15
@@ -8,7 +8,7 @@
 
 Package: nagios-common
 Architecture: all
-Depends: nagios, fileutils (>=4.0y) | coreutils (>= 4.5.3), apache | httpd, mailx, nagios-plugins (>= 1.3.1.0-6), adduser, ${misc:Depends}
+Depends: fileutils (>=4.0y) | coreutils (>= 4.5.3), apache | httpd, mailx, nagios-plugins (>= 1.3.1.0-6) | nagios-plugins-base, adduser, ${misc:Depends}
 Conflicts: nagios-text (<= 2:1.2-3.6), nagios-mysql (<= 2:1.2-3.6), nagios-pgsql (<= 2:1.2-3.6)
 Replaces: nagios
 Description: A host/service/network monitoring and management system

Index: rules
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/rules,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- rules	28 Aug 2005 19:23:43 -0000	1.20
+++ rules	16 Oct 2005 18:23:33 -0000	1.21
@@ -40,7 +40,7 @@
 				--with-nagios-user=nagios \
 				--with-nagios-grp=nagios \
 				--with-template-objects \
-				--with-file-perfdata \
+				--with-default-perfdata \
 				--build=$(DEB_BUILD_GNU_TYPE) \
 				--host=$(DEB_HOST_GNU_TYPE)