Updated to 4.3.0-1.

 * Removed migrate-hddtemp.dpatch - has been included upstream.

diff --git a/debian/changelog b/debian/changelog
index 576a20b0901a537de4ec362660129d01e75855ed..f4fafd572c9d8a176201058e0a95bf2078d76971 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-collectd (4.3.0~beta1-1) UNRELEASED; urgency=low
+collectd (4.3.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
     - Added basic support for monitoring by introducing notifications and
@@ -8,8 +8,6 @@ collectd (4.3.0~beta1-1) UNRELEASED; urgency=low
     New plugins:
     - Set the hostname to an unique identifier: uuid
     - CPU, dist, network statistics of guest systems: libvirt
-  * Added migrate-hddtemp.dpatch to handle the migration of hddtemp data
-    correctly.
   * Added libvirt-dev, libxml2-dev and libhal-dev to the build dependencies.
   * Updated package description to mention the monitoring support.
   * Install liboping/oping.h to collectd-dev as well.
@@ -24,7 +22,7 @@ collectd (4.3.0~beta1-1) UNRELEASED; urgency=low
   * Disable debugging support.
   * watch file: Added uversionmangle for "beta" and "-rc".
 
- -- Sebastian Harl <sh@tokkee.org>  Wed, 06 Feb 2008 00:00:04 +0100
+ -- Sebastian Harl <sh@tokkee.org>  Mon, 18 Feb 2008 22:22:16 +0100
 
 collectd (4.2.4-1) experimental; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index e208998eb94838b394f27a079e0fa0a691d6f04a..1ebda453056455e92958f720ec4181369e4cfcb9 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1,3 @@
 extractDS_path.dpatch
 collection_conf_path.dpatch
-migrate-hddtemp.dpatch
 

diff --git a/debian/patches/migrate-hddtemp.dpatch b/debian/patches/migrate-hddtemp.dpatch
deleted file mode 100755 (executable)
index 93aa325..0000000
--- a/debian/patches/migrate-hddtemp.dpatch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## migrate-hddtemp.dpatch by Florian Forster <octo@verplant.org>
-##
-## DP: contrib/migrate-3-4.px: Handle `hddtemp' graphs correctly.
-
-@DPATCH@
-
---- a/contrib/migrate-3-4.px
-+++ b/contrib/migrate-3-4.px
-@@ -95,6 +95,7 @@ our %Subdirs =
- our %TypeTranslate =
- (
-       cpu => sub { $_ = shift; $_->{'plugin_instance'} = $_->{'type_instance'}; $_->{'type_instance'} = undef; $_; },
-+      hddtemp => sub { $_ = shift; $_->{'plugin'} = 'hddtemp'; $_->{'type'} = 'temperature'; $_->{'type_instance'} = $_->{'type_instance'}; $_; },
-       if_errors => sub { $_ = shift; $_->{'type_instance'} = $_->{'plugin_instance'}; $_->{'plugin_instance'} = undef; $_; },
-       if_packets => sub { $_ = shift; $_->{'type_instance'} = $_->{'plugin_instance'}; $_->{'plugin_instance'} = undef; $_; },
-       nfs2_procedures => sub { $_ = shift; @$_{qw(plugin plugin_instance type type_instance)} = ('nfs', 'v2' . $_->{'type_instance'}, 'nfs_procedure', undef); $_; },