[Pkg-nagios-changes] [pkg-nagios] r1161 - nagios-plugins/trunk/debian

[Sean Finney]

tags 420954 pending
thanks

Author: seanius
Date: 2007-05-20 18:14:28 +0000 (Sun, 20 May 2007)
New Revision: 1161

Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/control
Log:
merge NMU, new upstream release

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2007-05-17 18:30:07 UTC (rev 1160)
+++ nagios-plugins/trunk/debian/changelog	2007-05-20 18:14:28 UTC (rev 1161)
@@ -1,6 +1,6 @@
-nagios-plugins (1.4.5-3) UNRELEASED; urgency=low
+nagios-plugins (1.4.8-1) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  New upstream release.
 
   [jan wagner]
   * add explicit IPv4 checks to disk.cfg, ftp.cfg, http.cfg, ldap.cfg,
@@ -21,9 +21,20 @@
   [sean finney]
   * the Architecture should be "all" for the empty nagios-plugins 
     metapackage (closes: #422083).
+  * Merge changes from and ack NMU. Thanks to Michael Tautschnig 
+    (closes: #420954).
+  * Modify the Suggests to prefer nagios2 to nagios-text.
 
- -- sean finney <seanius at debian.org>  Tue, 08 May 2007 21:14:37 +0200
+ -- sean finney <seanius at debian.org>  Sun, 20 May 2007 20:12:32 +0200
 
+nagios-plugins (1.4.5-2.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * nagios-plugins-standard must have a versioned depends on
+    nagios-plugins-basic (Closes: #420954)
+
+ -- Michael Tautschnig <tautschn at model.in.tum.de>  Fri, 18 May 2007 22:44:59 +0200
+
 nagios-plugins (1.4.5-2) unstable; urgency=medium
 
   * fix for spurious conffile-type prompts from ucf, thanks to

Modified: nagios-plugins/trunk/debian/control
===================================================================
--- nagios-plugins/trunk/debian/control	2007-05-17 18:30:07 UTC (rev 1160)
+++ nagios-plugins/trunk/debian/control	2007-05-20 18:14:28 UTC (rev 1161)
@@ -9,7 +9,7 @@
 Package: nagios-plugins
 Architecture: all
 Depends: nagios-plugins-basic, nagios-plugins-standard
-Suggests: nagios-text | nagios
+Suggests: nagios2 | nagios-text | nagios
 Description: Plugins for the nagios network monitoring and management system
  Nagios is a host/service/network monitoring and management system. It has
  the following features:
@@ -33,7 +33,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, procps, iputils-ping, ucf
 Conflicts: nagios-plugins (<= 1.4.2-3)
 Replaces: nagios-plugins, nagios-plugins-standard
-Suggests: nagios-text | nagios
+Suggests: nagios2 | nagios-text | nagios
 Description: Plugins for the nagios network monitoring and management system
  Nagios is a host/service/network monitoring and management system. It has
  the following features:
@@ -56,8 +56,8 @@
 Architecture: any
 Conflicts: nagios-plugins (<= 1.4.2-3)
 Replaces: nagios-plugins
-Depends: ${shlibs:Depends}, ${misc:Depends}, fping, qstat, snmp, radiusclient1, libnet-snmp-perl, dnsutils, bind9-host | host, smbclient, ucf, nagios-plugins-basic
-Suggests: nagios-text | nagios, whois
+Depends: ${shlibs:Depends}, ${misc:Depends}, fping, qstat, snmp, radiusclient1, libnet-snmp-perl, dnsutils, bind9-host | host, smbclient, ucf, nagios-plugins-basic (>= 1.4.5-2)
+Suggests: nagios2 | nagios-text | nagios, whois
 Description: Plugins for the nagios network monitoring and management system
  Nagios is a host/service/network monitoring and management system. It has
  the following features: