networkmanager: Move from meta-extras to meta

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3709 311d38ba-8fff-0310-9ca6-ca027cbcb966

meta/packages/networkmanager/files/25NetworkManager

@@ -9,6 +9,7 @@ case $1 in
     echo -n "Starting NetworkManager daemon: NetworkManager"
     /usr/sbin/NetworkManager 
     /usr/sbin/NetworkManagerDispatcher
+    /usr/sbin/wpa_supplicant -u &
     echo "."
   ;;
 
@@ -16,6 +17,7 @@ case $1 in
     echo -n "Stopping NetworkManager daemon: NetworkManager"
     kill `ps |grep  /usr/sbin/NetworkManagerDispatcher | grep -v grep | cut "-d " -f2`
     kill `ps |grep  /usr/sbin/NetworkManager | grep -v grep | cut "-d " -f2`
+    kill `ps |grep  /usr/sbin/wpa_supplicant | grep -v grep | cut "-d " -f2`
     echo "."
   ;;
 

meta/packages/networkmanager/networkmanager_svn.bb

@@ -7,7 +7,7 @@ DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp"
 RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client"
 
 PV = "0.7+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
 	file://no-restarts.diff;patch=1;pnum=0 \