diff -u collectd-4.8.2/debian/control collectd-4.8.2/debian/control
--- collectd-4.8.2/debian/control
+++ collectd-4.8.2/debian/control
@@ -1,7 +1,8 @@
 Source: collectd
 Section: utils
 Priority: optional
-Maintainer: Sebastian Harl <tokkee@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Sebastian Harl <tokkee@debian.org>
 Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  bison, flex, autotools-dev, libltdl-dev, pkg-config,
  iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel],
diff -u collectd-4.8.2/debian/changelog collectd-4.8.2/debian/changelog
--- collectd-4.8.2/debian/changelog
+++ collectd-4.8.2/debian/changelog
@@ -1,3 +1,10 @@
+collectd (4.8.2-1ubuntu0.1) lucid-proposed; urgency=low
+
+  * debian/patch/lp615509_curl_json.dpatch:
+    - permit check of local files with curl_json (LP: #615509)
+
+ -- Baptiste Mille-Mathias <baptiste.millemathias@gmail.com>  Tue, 24 Aug 2010 13:11:00 +0200
+
 collectd (4.8.2-1) unstable; urgency=medium
 
   * New upstream release:
diff -u collectd-4.8.2/debian/patches/00list collectd-4.8.2/debian/patches/00list
--- collectd-4.8.2/debian/patches/00list
+++ collectd-4.8.2/debian/patches/00list
@@ -6 +6 @@
-
+lp615509_curl_json.dpatch
only in patch2:
unchanged:
--- collectd-4.8.2.orig/debian/patches/lp615509_curl_json.dpatch
+++ collectd-4.8.2/debian/patches/lp615509_curl_json.dpatch
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## lp615509_curl_json.dpatch by Florian Forster <octo@huhu.verplant.org>
+## Reported by Baptiste Mille-Mathias <baptiste.millemathias@gmail.com>
+##
+## DP: curl_json: Permit to check also json local files.
+## DP:
+## DP: See <https://bugs.launchpad.net/ubuntu/+source/collectd/+bug/615509>
+## DP: for details.
+
+@DPATCH@
+
+From: Florian Forster <octo@huhu.verplant.org>
+Date: Sun, 8 Aug 2010 08:59:15 +0000 (+0200)
+Subject: curl json: Fix checking the response code.
+X-Git-Url: http://git.verplant.org/?p=collectd.git;a=commitdiff_plain;h=74ba45134a428c971bc9274b17e8d8bd210156e3
+
+curl json: Fix checking the response code.
+---
+
+diff --git a/src/curl_json.c b/src/curl_json.c
+index a7acc81..e34f90a 100644 (file)
+--- a/src/curl_json.c
++++ b/src/curl_json.c
+@@ -775,7 +775,8 @@ static int cj_curl_perform (cj_t *db, CURL *curl) /* {{{ */
+   curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &url);
+   curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &rc);
+ 
+-  if (rc != 200)
++  /* The response code is zero if a non-HTTP transport was used. */
++  if ((rc != 0) && (rc != 200))
+   {
+     ERROR ("curl_json plugin: curl_easy_perform failed with response code %ld (%s)",
+            rc, url);
\ No newline at end of file