From 781e78fc4cc0d1f2cdf01a210c9e4d18239af4ca Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Fri, 18 May 2012 10:28:37 +0000 Subject: [PATCH 1/3] new changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index f66aa84..5c328a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nagios-plugins (1.4.15-7) UNRELEASED; urgency=low + + * NOT RELEASED YET + + -- Jan Wagner Fri, 18 May 2012 12:27:45 +0200 + nagios-plugins (1.4.15-6) unstable; urgency=low * Add nagios-plugins-common package which ships files possibly needed also by From 425c7443cf0551e407a56b7915619127f50ceec4 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Fri, 18 May 2012 11:05:14 +0000 Subject: [PATCH 2/3] Recommand nagios-plugins-contrib --- debian/changelog | 4 +++- debian/control | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5c328a4..a8f37d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ nagios-plugins (1.4.15-7) UNRELEASED; urgency=low - * NOT RELEASED YET + * Recommand nagios-plugins-contrib via nagios-plugins, drop + nagios-plugins-common which gets installed by nagios-plugins-basic + anyways -- Jan Wagner Fri, 18 May 2012 12:27:45 +0200 diff --git a/debian/control b/debian/control index c086ff2..63856b0 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Standards-Version: 3.9.2 Package: nagios-plugins Architecture: all Depends: ${misc:Depends}, nagios-plugins-basic, nagios-plugins-standard -Recommends: nagios-plugins-common +Recommends: nagios-plugins-contrib Suggests: nagios3 | icinga Description: Plugins for nagios compatible monitoring systems (metapackage) Plugins for nagios compatible monitoring systems like Nagios and Icinga. From 68bbbef07c375739906360c39f1b7523693f5cd9 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Tue, 22 May 2012 18:03:55 +0000 Subject: [PATCH 3/3] 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 Fri, 18 May 2012 12:27:45 +0200 + -- Jan Wagner 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