control: No longer conflict/provide/replace the "collectd-$plugin" packages.

Those packages were available pre-Lenny only.

diff --git a/debian/changelog b/debian/changelog
index 160e6dd2f0963702690d6a7f8ac93d387126ad7d..a7d4745342cee5edfa4d3a5af8d1204765da14f7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,8 @@ collectd (4.8.2-1) unstable; urgency=low
       thanks to Anssi Kolehmainen for reporting this (Closes: #538795).
     - Build-depend on libltdl-dev to make it possible to use the system-wide
       libltdl.
+    - No longer conflict/provide/replace the pre-Lenny "collectd-$plugin"
+      packages.
   * debian/patches:
     - Removed gmond-fix-compile-error.dpatch -- included upstream.
   * debian/rules:
@@ -43,7 +45,7 @@ collectd (4.8.2-1) unstable; urgency=low
   * debian/README.Debian:
     - Added a short explanation of the package split.
 
- -- Sebastian Harl <tokkee@debian.org>  Wed, 23 Dec 2009 00:10:11 +0100
+ -- Sebastian Harl <tokkee@debian.org>  Thu, 24 Dec 2009 10:36:10 +0100
 
 collectd (4.8.1-2) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index a801e706d4980e63a0ff16dd0c17e617644b1488..590908f5d4fac4ce686123f4b162b8e498d4c3f1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,12 +16,7 @@ Recommends: perl, rrdtool, lm-sensors
 Suggests: collectd-dev, librrds-perl, liburi-perl, libhtml-parser-perl,
  libregexp-common-perl, libconfig-general-perl, httpd-cgi, hddtemp, mbmon,
  ${shlibs:Suggests}
-Conflicts: collectd-apache, collectd-dns, collectd-hddtemp, collectd-mysql,
- collectd-perl, collectd-ping, collectd-sensors
-Provides: collectd-apache, collectd-dns, collectd-hddtemp, collectd-mysql,
- collectd-perl, collectd-ping, collectd-sensors
-Replaces: collectd-apache, collectd-dns, collectd-hddtemp, collectd-mysql,
- collectd-perl, collectd-ping, collectd-sensors, collectd (<< 4.8.1-2~)
+Replaces: collectd (<< 4.8.1-2~)
 Description: statistics collection and monitoring daemon (core system)
  collectd is a small daemon which collects system information periodically and
  provides mechanisms to monitor and store the values in a variety of ways.