migrate-3-4.px requires perl and rrdtool but no longer XML::Simple.

diff --git a/debian/collectd.config b/debian/collectd.config
index 2bbbf8e167f59085384891514048039671e110b5..38ccb2201dc0fdb2c1bb4693f1950badd5818bd7 100755 (executable)
--- a/debian/collectd.config
+++ b/debian/collectd.config
@@ -17,7 +17,7 @@ case "$1" in
         db_set collectd/auto-migrate-3-4 false
 
         if dpkg --compare-versions "$2" lt-nl "4.0.0~"; then
-            if perl -MXML::Simple -e '1' 2> /dev/null; then
+            if perl -e '1' 2> /dev/null && rrdtool > /dev/null 2>&1; then
                 db_input high collectd/auto-migrate-3-4 || true
                 db_go || true
             else

diff --git a/debian/collectd.templates b/debian/collectd.templates
index b1f2f76faca6f0fdf0d878ef48e1b7f3ac71e215..c9d71dca0acaf718f98531c74d27787527494789 100644 (file)
--- a/debian/collectd.templates
+++ b/debian/collectd.templates
@@ -5,8 +5,8 @@ _Description: Layout of RRD files has changed
  since version 3.x. In order to keep your old data you have to migrate it.
  This can be done by using /usr/lib/collectd/utils/migrate-3-4.px.
  .
- This step requires the XML::Simple Perl module (libxml-simple-perl) which you
- do not currently have installed. You need to perform the migration manually.
+ This step requires the perl and rrdtool packages which you do not currently
+ have installed. You need to perform the migration manually.
  .
  See /usr/share/doc/collectd/NEWS.Debian for details.
 

diff --git a/debian/control b/debian/control
index f8681883a92aa3ddf49925ead8093e2da4ca59b2..ae69c3fdb36ac9d769f90eb063ca4400600e364d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.7.2
 Package: collectd
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: libxml-simple-perl
+Recommends: perl, rrdtool
 Suggests: collectd-apache, collectd-mysql, collectd-sensors, collectd-dev,
  collectd-ping, collectd-dns, collectd-perl,librrds-perl, hddtemp, mbmon
 Provides: collectd-hddtemp