Merge branch 'master' into experimental

Conflicts:
	debian/changelog
	debian/patches/series

1 files changed, 24 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index fcdd1df9..15698c52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,30 @@ network-manager (0.9.5.95-1) experimental; urgency=low
 
  -- Michael Biebl <biebl@debian.org>  Fri, 29 Jun 2012 20:30:16 +0200
 
+network-manager (0.9.4.0-8) unstable; urgency=low
+
+  * Move the pkla file to /etc/polkit-1 as requested by the release team.
+  * debian/patches/04-systemd-set-kill-mode-process.patch: By default, when
+    shutting NM down, systemd will kill everything in its cgroup. But this
+    can cause problems (eg, NM thinking that dhclient crashed and then taking
+    down an interface that it would otherwise have left up). Fix this by
+    setting KillMode=process, which tells systemd to only kill NM itself, and
+    let NM kill its children. Patch cherry-picked from upstream Git.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 05 Jan 2013 20:23:27 +0100
+
+network-manager (0.9.4.0-7) unstable; urgency=low
+
+  * Install a PolicyKit pkla file which allows members of group netdev or sudo
+    to create system-wide network connections without being prompted for the
+    admin password. (Closes: #642136)
+  * Cherry-pick patches for libnm-glib which fix various segfaults e.g. in
+    gnome-control-center when switching between overview and network settings
+    panel or in gnome-shell and nm-applet when restarting NetworkManager.
+    (Closes: #696143) (bgo: #674473)
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 21 Dec 2012 03:48:18 +0100
+
 network-manager (0.9.4.0-6) unstable; urgency=low
 
   * debian/rules: Use xz compression for binary packages.