diff -u munin-1.4.5/debian/changelog munin-1.4.5/debian/changelog
--- munin-1.4.5/debian/changelog
+++ munin-1.4.5/debian/changelog
@@ -1,3 +1,17 @@
+munin (1.4.5-3ubuntu2) natty; urgency=low
+
+  * Add debian/patches/upstream_bug_952.patch (LP: #699967) to fix empty list
+    of plugins/services
+  * Add "timeout" to list of legal config keywords, allowing to configure it
+    for munin-update in munin.conf.
+    - Upstream bug: http://munin-monitoring.org/ticket/1021
+    - Patch: debian/patches/upstream_add-timeout-to-legal-options.patch
+  * Fix ignoring of pid_file from config
+    - Upstream bug: http://munin-monitoring.org/ticket/975 (fixed for 1.4.6)
+    - Patch: debian/patches/upstream_bug-975-fixed-in-1.4.6.patch
+
+ -- Daniel Hahler <ubuntu@thequod.de>  Thu, 27 Jan 2011 00:36:44 +0100
+
 munin (1.4.5-3ubuntu1) natty; urgency=low
 
   * Merge from debian unstable. (LP: #661505)  Remaining changes:
diff -u munin-1.4.5/debian/patches/series munin-1.4.5/debian/patches/series
--- munin-1.4.5/debian/patches/series
+++ munin-1.4.5/debian/patches/series
@@ -1,3 +1,6 @@
+upstream_add-timeout-to-legal-options.patch
+upstream_bug-975-fixed-in-1.4.6.patch
+upstream_bug_952.patch
 100-DejaVu-Fonts-Path.patch
 101-dash-bash-fw_conntrack.patch
 102-snort-bashism.patch
only in patch2:
unchanged:
--- munin-1.4.5.orig/debian/patches/upstream_bug-975-fixed-in-1.4.6.patch
+++ munin-1.4.5/debian/patches/upstream_bug-975-fixed-in-1.4.6.patch
@@ -0,0 +1,12 @@
+Index: munin-1.4.5/node/sbin/munin-node
+===================================================================
+--- munin-1.4.5.orig/node/sbin/munin-node	2011-01-27 00:34:22.000000000 +0100
++++ munin-1.4.5/node/sbin/munin-node	2011-01-27 00:36:31.000000000 +0100
+@@ -99,7 +99,6 @@
+     Munin::Node::Server->run(
+        syslog_ident => 'munin-node',
+        conf_file    => $conffile,
+-       pid_file     => "$Munin::Common::Defaults::MUNIN_STATEDIR/munin-node.pid"
+     );
+ 
+     return 0;
only in patch2:
unchanged:
--- munin-1.4.5.orig/debian/patches/upstream_add-timeout-to-legal-options.patch
+++ munin-1.4.5/debian/patches/upstream_add-timeout-to-legal-options.patch
@@ -0,0 +1,13 @@
+Index: munin-1.4.5/common/lib/Munin/Common/Config.pm
+===================================================================
+--- munin-1.4.5.orig/common/lib/Munin/Common/Config.pm	2011-01-27 00:27:40.000000000 +0100
++++ munin-1.4.5/common/lib/Munin/Common/Config.pm	2011-01-27 00:27:48.000000000 +0100
+@@ -37,7 +37,7 @@
+ 	"cdef_name", "graphable", "process", "realname",
+ 	"onlynullcdef", "group_order", "pipe", "pipe_command",
+ 	"unknown_limit", "num_unknowns", "dropdownlimit",
+-	"max_graph_jobs", "max_cgi_graph_jobs", "munin_cgi_graph_jobs" );
++	"max_graph_jobs", "max_cgi_graph_jobs", "munin_cgi_graph_jobs", "timeout" );
+ 
+ my %bools = map { $_ => 1} qw(yes no true false on off 1 0);
+ 
only in patch2:
unchanged:
--- munin-1.4.5.orig/debian/patches/upstream_bug_952.patch
+++ munin-1.4.5/debian/patches/upstream_bug_952.patch
@@ -0,0 +1,13 @@
+Index: munin-1.4.5/node/lib/Munin/Node/Server.pm
+===================================================================
+--- munin-1.4.5.orig/node/lib/Munin/Node/Server.pm	2011-01-07 19:41:00.000000000 +0100
++++ munin-1.4.5/node/lib/Munin/Node/Server.pm	2011-01-07 19:41:13.000000000 +0100
+@@ -171,7 +171,7 @@
+ 
+     logger ("DEBUG: Running command \"$_\".") if $config->{DEBUG};
+     if (/^list\s*([0-9a-zA-Z\.\-]+)?/i) {
+-        _list_services($session, $1);
++        _list_services($session, lc($1));
+     }
+     elsif (/^cap\s?(.*)/i) {
+         _negotiate_session_capabilities($session, $1);