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

[Jan Wagner]

tags 673891 pending
thanks

Author: waja
Date: 2012-05-22 18:03:55 +0000 (Tue, 22 May 2012)
New Revision: 2030

Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/control
Log:
make use of replaces

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2012-05-18 11:05:14 UTC (rev 2029)
+++ nagios-plugins/trunk/debian/changelog	2012-05-22 18:03:55 UTC (rev 2030)
@@ -1,10 +1,12 @@
-nagios-plugins (1.4.15-7) UNRELEASED; urgency=low
+nagios-plugins (1.4.15-7) unstable; urgency=low
 
   * Recommand nagios-plugins-contrib via nagios-plugins, drop
     nagios-plugins-common which gets installed by nagios-plugins-basic
     anyways
+  * Add Replaces: nagios-plugins-basic to nagios-plugins-common
+    (Closes: #673891), thanks to Christoph Anton Mitterer
 
- -- Jan Wagner <waja at cyconet.org>  Fri, 18 May 2012 12:27:45 +0200
+ -- Jan Wagner <waja at cyconet.org>  Tue, 22 May 2012 20:00:03 +0200
 
 nagios-plugins (1.4.15-6) unstable; urgency=low
 

Modified: nagios-plugins/trunk/debian/control
===================================================================
--- nagios-plugins/trunk/debian/control	2012-05-18 11:05:14 UTC (rev 2029)
+++ nagios-plugins/trunk/debian/control	2012-05-22 18:03:55 UTC (rev 2030)
@@ -25,7 +25,7 @@
 Package: nagios-plugins-common
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ucf
-Breaks: nagios-plugins-basic (<= 1.4.15-5)
+Replaces: nagios-plugins-basic (<= 1.4.15-5)
 Suggests: nagios3 | icinga
 Description: Common files for plugins for nagios compatible monitoring
  Common files for plugins for nagios compatible monitoring systems like Nagios
@@ -36,7 +36,7 @@
 Package: nagios-plugins-basic
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, procps, iputils-ping [linux-any], inetutils-ping [kfreebsd-any hurd-any], ucf
-Pre-Depends: nagios-plugins-common
+Pre-Depends: nagios-plugins-common (>= 1.4.15-6)
 Conflicts: nagios-plugins (<= 1.4.2-3)
 Replaces: nagios-plugins, nagios-plugins-standard
 Suggests: nagios3 | icinga