patches/: Added postgresql_conf_fix.dpatch.

This is an upstream patch to fix the use of deprecated configuration options.

diff --git a/debian/changelog b/debian/changelog
index 5f1f21c122d0e7ecb90fa7cdee2e962b38633277..b0253d76b14a7f62c0c37d9915fcad0f52b6596a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,8 +40,11 @@ collectd (4.6.1-1) unstable; urgency=low
   * debian/collectd.overrides:
     - Override "spelling-error-in-description" for the apache plugin name -
       all plugins are spelled lowercase.
+  * debian/patches/:
+    - Added postgresql_conf_fix.dpatch - upstream patch to fix the use of
+      deprecated configuration options.
 
- -- Sebastian Harl <sh@tokkee.org>  Tue, 03 Mar 2009 18:32:27 +0100
+ -- Sebastian Harl <sh@tokkee.org>  Sat, 07 Mar 2009 17:29:39 +0100
 
 collectd (4.5.1-1) experimental; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index 332b35c8333c22b54c6ead8e9d0f6750c3bfbc7f..75ae68dd27324bf2fa715a79f226a005dc752b0f 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
 rrd_filter_path.dpatch
 collection_conf_path.dpatch
+postgresql_conf_fix.dpatch
 

diff --git a/debian/patches/postgresql_conf_fix.dpatch b/debian/patches/postgresql_conf_fix.dpatch
new file mode 100755 (executable)
index 0000000..74d9e72
--- /dev/null
+++ b/debian/patches/postgresql_conf_fix.dpatch
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## postgresql_conf_fix.dpatch by Sebastian Harl <sh@tokkee.org>
+##
+## DP: postgresql_default.conf: Don't use the deprecated {Min,Max}PgVersion
+## DP: options.
+
+@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>