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 +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Sebastian Harl 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 Tue, 24 Aug 2010 13:21:26 +0200 + collectd (4.8.2-1) unstable; urgency=medium * New upstream release: diff -u collectd-4.8.2/debian/po/nl.po collectd-4.8.2/debian/po/nl.po --- collectd-4.8.2/debian/po/nl.po +++ collectd-4.8.2/debian/po/nl.po @@ -10,6 +10,7 @@ "PO-Revision-Date: 2008-09-28 15:22+0100\n" "Last-Translator: Eric Spreen \n" "Language-Team: Dutch \n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -32,8 +33,8 @@ msgstr "" "De lay-out van de RRD-bestanden, die zijn gemaakt door collectd, is sterk " "gewijzigd sinds versie 3.x. Om uw oude gegevens te behouden zult u deze " -"moeten migreren. Dit kunt u doen door /usr/lib/collectd-core/utils/migrate-3" -"-4.px te gebruiken." +"moeten migreren. Dit kunt u doen door /usr/lib/collectd-core/utils/" +"migrate-3-4.px te gebruiken." #. Type: note #. Description diff -u collectd-4.8.2/debian/po/sv.po collectd-4.8.2/debian/po/sv.po --- collectd-4.8.2/debian/po/sv.po +++ collectd-4.8.2/debian/po/sv.po @@ -11,6 +11,7 @@ "PO-Revision-Date: 2008-11-02 05:17+0100\n" "Last-Translator: Martin Bagge \n" "Language-Team: swedish \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -53,7 +54,8 @@ #: ../collectd-core.templates:1001 ../collectd-core.templates:2001 msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details." msgstr "" -"Läs även /usr/share/doc/collectd-core/NEWS.Debian för ytterligare information." +"Läs även /usr/share/doc/collectd-core/NEWS.Debian för ytterligare " +"information." #. Type: boolean #. Description diff -u collectd-4.8.2/debian/po/ru.po collectd-4.8.2/debian/po/ru.po --- collectd-4.8.2/debian/po/ru.po +++ collectd-4.8.2/debian/po/ru.po @@ -9,12 +9,13 @@ "PO-Revision-Date: 2009-07-26 16:00+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Type: note #. Description diff -u collectd-4.8.2/debian/po/fr.po collectd-4.8.2/debian/po/fr.po --- collectd-4.8.2/debian/po/fr.po +++ collectd-4.8.2/debian/po/fr.po @@ -11,6 +11,7 @@ "PO-Revision-Date: 2008-03-14 01:00+0100\n" "Last-Translator: Florent USSEIL \n" "Language-Team: French \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u collectd-4.8.2/debian/po/de.po collectd-4.8.2/debian/po/de.po --- collectd-4.8.2/debian/po/de.po +++ collectd-4.8.2/debian/po/de.po @@ -11,6 +11,7 @@ "PO-Revision-Date: 2008-03-12 23:33+0100\n" "Last-Translator: Kai Wasserbäch \n" "Language-Team: German \n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u collectd-4.8.2/debian/po/vi.po collectd-4.8.2/debian/po/vi.po --- collectd-4.8.2/debian/po/vi.po +++ collectd-4.8.2/debian/po/vi.po @@ -10,6 +10,7 @@ "PO-Revision-Date: 2009-02-18 15:36+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" +"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -53,7 +54,8 @@ #: ../collectd-core.templates:1001 ../collectd-core.templates:2001 msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details." msgstr "" -"Xem tài liệu Tin Tức « /usr/share/doc/collectd-core/NEWS.Debian » để tìm chi tiết." +"Xem tài liệu Tin Tức « /usr/share/doc/collectd-core/NEWS.Debian » để tìm chi " +"tiết." #. Type: boolean #. Description diff -u collectd-4.8.2/debian/po/cs.po collectd-4.8.2/debian/po/cs.po --- collectd-4.8.2/debian/po/cs.po +++ collectd-4.8.2/debian/po/cs.po @@ -10,6 +10,7 @@ "PO-Revision-Date: 2009-06-22 16:07+0200\n" "Last-Translator: Martin Sin \n" "Language-Team: Czech \n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u collectd-4.8.2/debian/po/pt.po collectd-4.8.2/debian/po/pt.po --- collectd-4.8.2/debian/po/pt.po +++ collectd-4.8.2/debian/po/pt.po @@ -11,6 +11,7 @@ "PO-Revision-Date: 2008-03-22 00:49+0000\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u collectd-4.8.2/debian/po/es.po collectd-4.8.2/debian/po/es.po --- collectd-4.8.2/debian/po/es.po +++ collectd-4.8.2/debian/po/es.po @@ -35,6 +35,7 @@ "PO-Revision-Date: 2009-03-21 23:09+0100\n" "Last-Translator: Francisco Javier Cuadrado \n" "Language-Team: Debian l10n Spanish \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -78,7 +79,8 @@ #. Description #: ../collectd-core.templates:1001 ../collectd-core.templates:2001 msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details." -msgstr "Vea el archivo «/usr/share/doc/collectd-core/NEWS.Debian» para más detalles." +msgstr "" +"Vea el archivo «/usr/share/doc/collectd-core/NEWS.Debian» para más detalles." #. Type: boolean #. Description diff -u collectd-4.8.2/debian/po/gl.po collectd-4.8.2/debian/po/gl.po --- collectd-4.8.2/debian/po/gl.po +++ collectd-4.8.2/debian/po/gl.po @@ -10,6 +10,7 @@ "PO-Revision-Date: 2008-05-24 11:24+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u collectd-4.8.2/debian/po/ja.po collectd-4.8.2/debian/po/ja.po --- collectd-4.8.2/debian/po/ja.po +++ collectd-4.8.2/debian/po/ja.po @@ -9,6 +9,7 @@ "PO-Revision-Date: 2009-10-06 17:32+0900\n" "Last-Translator: Hideki Yamane (Debian-JP) \n" "Language-Team: Japanese \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" 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 +## Reported by Baptiste Mille-Mathias +## +## DP: curl_json: Permit to check also json local files. +## DP: +## DP: See +## DP: for details. + +@DPATCH@ + +From: Florian Forster +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