From 70c1912d3dc39001a8472db9f77a44c40c2d2963 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Mon, 2 Jun 2014 22:19:00 +0200 Subject: [PATCH] droped patch because fixed upstream --- debian/changelog | 4 +++- debian/patches/json-c-FTBFS-fix.patch | 26 -------------------------- debian/patches/series | 1 - 3 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 debian/patches/json-c-FTBFS-fix.patch delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 016396a..b3058a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,7 +15,9 @@ psensor (1.0.1-1) unstable; urgency=low + excanvas.js (removed upstream) copyright removed. * debian/rules + use autoreconf to update libtool and configure. (Closes: #749110) - + * debian/patches/json-c-FTBFS-fix.patch + + droped, fixed upstream + -- Jean-Philippe Orsini Mon, 02 Jun 2014 22:17:16 +0200 psensor (0.8.0.4-1.1) unstable; urgency=low diff --git a/debian/patches/json-c-FTBFS-fix.patch b/debian/patches/json-c-FTBFS-fix.patch deleted file mode 100644 index d5f82cd..0000000 --- a/debian/patches/json-c-FTBFS-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -Description: Update json usage for current API - The json-c interface was using a deprecated method. - This cherry-picked patch from upstream fixes it. - . - psensor (0.8.0.4-1.1) unstable; urgency=low - . -Author: Wookey -Bug-Debian: http://bugs.debian.org/746145 -Origin: upstream, http://wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff;h=695aaee544240f86415140a77f5716f858bec91e -Last-Update: 2014-05-31 - ---- psensor-0.8.0.4.orig/src/lib/psensor_json.c -+++ psensor-0.8.0.4/src/lib/psensor_json.c -@@ -140,9 +140,9 @@ struct psensor *psensor_new_from_json(js - struct psensor *s; - char *eid, *url; - -- oid = json_object_object_get(o, "id"); -- oname = json_object_object_get(o, "name"); -- otype = json_object_object_get(o, "type"); -+ json_object_object_get_ex(o, "id", &oid); -+ json_object_object_get_ex(o, "name", &oname); -+ json_object_object_get_ex(o, "type", &otype); - - eid = url_encode(json_object_get_string(oid)); - url = malloc(strlen(sensors_url) + 1 + strlen(eid) + 1); diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index ed8e002..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -json-c-FTBFS-fix.patch -- 2.7.4