diff -u collectd-4.10.1/debian/changelog collectd-4.10.1/debian/changelog
--- collectd-4.10.1/debian/changelog
+++ collectd-4.10.1/debian/changelog
@@ -1,3 +1,10 @@
+collectd (4.10.1-2.1ubuntu8) quantal; urgency=low
+
+  * Track changes to libyajl2 API.
+  * Track changes to libnetfilter API.
+
+ -- Andy Whitcroft <apw@ubuntu.com>  Tue, 19 Jun 2012 11:24:33 +0100
+
 collectd (4.10.1-2.1ubuntu7) precise; urgency=low
 
   * Rebuild for libmysqlclient transition
diff -u collectd-4.10.1/debian/patches/00list collectd-4.10.1/debian/patches/00list
--- collectd-4.10.1/debian/patches/00list
+++ collectd-4.10.1/debian/patches/00list
@@ -11,0 +12,2 @@
+yajl2_porting.dpatch
+iproute_porting.dpatch
only in patch2:
unchanged:
--- collectd-4.10.1.orig/debian/patches/yajl2_porting.dpatch
+++ collectd-4.10.1/debian/patches/yajl2_porting.dpatch
@@ -0,0 +1,59 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## yajl2_porting.dpatch by Andy Whitcroft <apw@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Switch to libyajl2 API.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' collectd-4.10.1~/src/curl_json.c collectd-4.10.1/src/curl_json.c
+--- collectd-4.10.1~/src/curl_json.c	2012-06-19 12:35:49.000000000 +0100
++++ collectd-4.10.1/src/curl_json.c	2012-06-19 12:37:40.666729868 +0100
+@@ -100,11 +100,9 @@
+   status = yajl_parse(db->yajl, (unsigned char *)buf, len);
+   if (status == yajl_status_ok)
+   {
+-    status = yajl_parse_complete(db->yajl);
++    status = yajl_complete_parse(db->yajl);
+     return (len);
+   }
+-  else if (status == yajl_status_insufficient_data)
+-    return (len);
+ 
+   if (status != yajl_status_ok)
+   {
+@@ -130,7 +128,7 @@
+ }
+ 
+ /* yajl callbacks */
+-static int cj_cb_integer (void *ctx, long val)
++static int cj_cb_integer (void *ctx, long long val)
+ {
+   cj_t *db = (cj_t *)ctx;
+   cj_key_t *key = db->state[db->depth].key;
+@@ -185,7 +183,7 @@
+ }
+ 
+ static int cj_cb_map_key (void *ctx, const unsigned char *val,
+-                            unsigned int len)
++                            size_t len)
+ {
+   cj_t *db = (cj_t *)ctx;
+   c_avl_tree_t *tree;
+@@ -213,7 +211,7 @@
+ }
+ 
+ static int cj_cb_string (void *ctx, const unsigned char *val,
+-                           unsigned int len)
++                           size_t len)
+ {
+   cj_t *db = (cj_t *)ctx;
+   c_avl_tree_t *tree;
+@@ -762,7 +760,7 @@
+   char *url;
+   yajl_handle yprev = db->yajl;
+ 
+-  db->yajl = yajl_alloc (&ycallbacks, NULL, NULL, (void *)db);
++  db->yajl = yajl_alloc (&ycallbacks, NULL, (void *)db);
+   if (db->yajl == NULL)
+   {
+     ERROR ("curl_json plugin: yajl_alloc failed.");
only in patch2:
unchanged:
--- collectd-4.10.1.orig/debian/patches/iproute_porting.dpatch
+++ collectd-4.10.1/debian/patches/iproute_porting.dpatch
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## iproute_porting.dpatch by Andy Whitcroft <apw@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Track changes to libnetfilter API
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' collectd-4.10.1~/src/netlink.c collectd-4.10.1/src/netlink.c
+--- collectd-4.10.1~/src/netlink.c	2010-07-09 11:01:59.000000000 +0100
++++ collectd-4.10.1/src/netlink.c	2012-06-19 11:01:12.130026054 +0100
+@@ -570,8 +570,7 @@
+     return (-1);
+   }
+ 
+-  if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL,
+-	NULL, NULL) != 0)
++  if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL) != 0)
+   {
+     ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed.");
+     return (-1);
+@@ -608,8 +607,7 @@
+ 	continue;
+       }
+ 
+-      if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex,
+-	    NULL, NULL) != 0)
++      if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex) != 0)
+       {
+ 	ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed.");
+ 	continue;