[Pkg-nagios-changes] [pkg-nagios-plugins] 306/413: make use of replaces

[Jan Wagner]

This is an automated email from the git hooks/post-receive script.

waja pushed a commit to branch master
in repository pkg-nagios-plugins.

commit 68bbbef07c375739906360c39f1b7523693f5cd9
Author: Jan Wagner <waja at cyconet.org>
Date:   Tue May 22 18:03:55 2012 +0000

    make use of replaces
---
 debian/changelog | 6 ++++--
 debian/control   | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a8f37d8..cc204b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
 
diff --git a/debian/control b/debian/control
index 63856b0..be2a07e 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Description: Plugins for nagios compatible monitoring systems (metapackage)
 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 @@ Description: Common files for plugins for nagios compatible monitoring
 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-plugins.git