Merge branch 'master' into experimental

Conflicts:
	debian/changelog
	debian/patches/series

1 files changed, 27 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index a700db41..fff8ab78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,33 @@ 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-9) unstable; urgency=low
+
+  * Change the ifupdown dispatcher script and set ADDRFAM to "inet" or "inet6"
+    depending on whether the connection has a valid IPv4 or IPv6 address.
+    Using "NetworkManager" as ADDRFAM type did confuse most ifupdown hook
+    scripts and e.g. broke async NFS mounts. (Closes: #475188, #656584)
+  * debian/patches/05-force-online-with-unmanaged-devices.patch: If network
+    interfaces are configured in /etc/network/interfaces, NM will mark those
+    devices as unmanaged by default. If such a network interface has been
+    brought up by ifup, set the global online state to CONNECTED.
+    (Closes: #512286)
+  * No longer run the ifblacklist_migrate.sh script upon installation. This
+    script was used to comment out DHCP type network interface configurations
+    in /etc/network/interfaces as otherwise NM would mark such devices as
+    unmanaged. This script was buggy though and sometimes created a broken
+    network configuration.
+    Since debian-installer in wheezy (7.0) will create proper configuration
+    for NM if the network-manager package is part of the installation, this is
+    no longer necessary.
+    If users make a minimal system installation and install the
+    network-manager package afterwards, show a warning in postinst if we
+    find any interface configurations in /etc/network/interfaces.
+    (Closes: #688355, #690987, #606268)
+  * Update README.Debian for the latest changes.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 29 Jan 2013 04:10:11 +0100
+
 network-manager (0.9.4.0-8) unstable; urgency=low
 
   * Move the pkla file to /etc/polkit-1 as requested by the release team.