Updated to collectd-4.6.2-1.

Removed postgresql_conf_fix.dpatch and types_list.dpatch, which have been
included in 4.6.2.

diff --git a/debian/changelog b/debian/changelog
index 4c876c7e1ddc33565fa330719a62f131b35a1281..7a6cc4832861f1447f7258f058639a016d0ba205 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-collectd (4.6.1-1) unstable; urgency=low
+collectd (4.6.2-1) unstable; urgency=low
 
   * New upstream release.
     - Added a filter infrastructure based on "matches" and "targets".
@@ -24,11 +24,6 @@ collectd (4.6.1-1) unstable; urgency=low
     - vi.po, thanks to Clytie Siddall (Closes: #515872).
   * debian/patches:
     - Removed perl-uninitialized-var.dpatch - included upstream.
-    - Added postgresql_conf_fix.dpatch - upstream patch to fix the use of
-      deprecated configuration options and to make sure the "disk_io" query
-      does not return NULLs.
-    - Added types_list.dpatch - upstream patch to improved error messages when
-      handling "TypesDB".
   * debian/control:
     - Added new binary packages libcollectdclient0 and libcollectdclient-dev
       for the newly added client library.
@@ -56,7 +51,7 @@ collectd (4.6.1-1) unstable; urgency=low
     - Reference GPL-2 in addition to GPL (latest version), since GPL2-only is
       used by some files.
 
- -- Sebastian Harl <sh@tokkee.org>  Thu, 02 Apr 2009 16:00:16 +0200
+ -- Sebastian Harl <sh@tokkee.org>  Thu, 02 Apr 2009 16:04:35 +0200
 
 collectd (4.5.1-1) experimental; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index 349c0d51d8cad5fd46df9023f25d1725c469516f..332b35c8333c22b54c6ead8e9d0f6750c3bfbc7f 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,5 +1,3 @@
 rrd_filter_path.dpatch
 collection_conf_path.dpatch
-postgresql_conf_fix.dpatch
-types_list.dpatch
 

diff --git a/debian/patches/postgresql_conf_fix.dpatch b/debian/patches/postgresql_conf_fix.dpatch
deleted file mode 100755 (executable)
index 57c5bd1..0000000
--- a/debian/patches/postgresql_conf_fix.dpatch
+++ /dev/null
@@ -1,73 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## postgresql_conf_fix.dpatch by Sebastian Harl <sh@tokkee.org>
-##
-## DP: postgresql_default.conf:
-## DP:
-## DP:  * Don't use the deprecated {Min,Max}PgVersion options.
-## DP:
-## DP:  * Make sure the "disk_io" query does not return NULLs.
-## DP:
-## DP:    Starting with some version between 8.3.3 and 8.3.6,
-## DP:    pg_statio_*_tables returns NULL instead of 0 for statistics if no
-## DP:    instance of the appropriate relation exists. PQgetvalue() returns an
-## DP:    empty string in that case which would then result in error messages
-## DP:    when udb_result_submit() tries to convert that to a number.
-## DP:
-## DP:    Now, the "disk_io" query uses PostgreSQL's coalesce() function to
-## DP:    make sure 0 is returned instead of NULL.
-
-@DPATCH@
-
-diff a/src/postgresql_default.conf b/src/postgresql_default.conf
---- a/src/postgresql_default.conf
-+++ b/src/postgresql_default.conf
-@@ -54,7 +54,7 @@
-               ValuesFrom "del"
-       </Result>
- 
--      MaxPGVersion 80299
-+      MaxVersion 80299
- </Query>
- 
- <Query queries>
-@@ -85,7 +85,7 @@
-               ValuesFrom "hot_upd"
-       </Result>
- 
--      MinPGVersion 80300
-+      MinVersion 80300
- </Query>
- 
- <Query query_plans>
-@@ -132,7 +132,7 @@
-               ValuesFrom "dead"
-       </Result>
- 
--      MinPGVersion 80300
-+      MinVersion 80300
- </Query>
- 
- <Query disk_io>
-@@ -141,14 +141,14 @@
- </Query>
- 
- <Query disk_io>
--      Statement "SELECT sum(heap_blks_read) AS heap_read, \
--                      sum(heap_blks_hit) AS heap_hit, \
--                      sum(idx_blks_read) AS idx_read, \
--                      sum(idx_blks_hit) AS idx_hit, \
--                      sum(toast_blks_read) AS toast_read, \
--                      sum(toast_blks_hit) AS toast_hit, \
--                      sum(tidx_blks_read) AS tidx_read, \
--                      sum(tidx_blks_hit) AS tidx_hit \
-+      Statement "SELECT coalesce(sum(heap_blks_read), 0) AS heap_read, \
-+                      coalesce(sum(heap_blks_hit), 0) AS heap_hit, \
-+                      coalesce(sum(idx_blks_read), 0) AS idx_read, \
-+                      coalesce(sum(idx_blks_hit), 0) AS idx_hit, \
-+                      coalesce(sum(toast_blks_read), 0) AS toast_read, \
-+                      coalesce(sum(toast_blks_hit), 0) AS toast_hit, \
-+                      coalesce(sum(tidx_blks_read), 0) AS tidx_read, \
-+                      coalesce(sum(tidx_blks_hit), 0) AS tidx_hit \
-               FROM pg_statio_user_tables;"
- 
-       <Result>

diff --git a/debian/patches/types_list.dpatch b/debian/patches/types_list.dpatch
deleted file mode 100755 (executable)
index fc66d02..0000000
--- a/debian/patches/types_list.dpatch
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## types_list.dpatch by Sebastian Harl <sh@tokkee.org>
-##
-## DP: configfile, types_list:
-## DP: Improved error messages when handling "TypesDB".
-
-@DPATCH@
-
-diff a/src/types_list.c b/src/types_list.c
---- a/src/types_list.c
-+++ b/src/types_list.c
-@@ -172,7 +172,9 @@ int read_types_list (const char *file)
-   if (fh == NULL)
-   {
-     char errbuf[1024];
--    ERROR ("open (%s) failed: %s", 
-+    fprintf (stderr, "Failed to open types database `%s': %s.\n",
-+      file, sstrerror (errno, errbuf, sizeof (errbuf)));
-+    ERROR ("Failed to open types database `%s': %s",
-       file, sstrerror (errno, errbuf, sizeof (errbuf)));
-     return (-1);
-   }