3 files changed, 30 insertions, 24 deletions
diff --git a/packages/networkmanager/networkmanager.inc b/packages/networkmanager/networkmanager.inc
index ce819d64ac..2a0f28753f 100644
--- a/packages/networkmanager/networkmanager.inc
+++ b/packages/networkmanager/networkmanager.inc
@@ -5,8 +5,7 @@ HOMEPAGE = "http://www.gnome.org"
 PRIORITY = "optional"
 DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools"
 RDEPENDS = "wpa-supplicant iproute2 dhcdbd"
-
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${PV}.tar.bz2 \
 	  file://NetworkManager \
@@ -21,7 +20,7 @@ EXTRA_OECONF = " \
 		--without-gcrypt \
  		--with-wpa_supplicant=/usr/sbin/wpa_supplicant \
 		--with-dhcdbd=/sbin/dhcdbd \
-		--with-ip=/sbin/ip"
+		--with-ip=/sbin/ip.iproute2"
 
 inherit autotools pkgconfig
 
@@ -48,13 +47,18 @@ fi
 /etc/init.d/populate-volatile.sh update
 }
 
-PACKAGES =+ "libnmutil libnmglib" 
+PACKAGES =+ "libnmutil libnmglib libnmglib-vpn" 
 
 FILES_libnmutil += "${libdir}/libnm-util.so.*"
 FILES_libnmglib += "${libdir}/libnm_glib.so.*"
+FILES_libnmglib-vpn += "${libdir}/libnm_glib_vpn.so.*"
 
-FILES_${PN} += "${datadir} \
-		${libexecdir}"
+FILES_${PN} += " \
+		${libexecdir} \
+		${libdir}/pppd/*/nm-pppd-plugin.so \
+		${libdir}/NetworkManager/*.so"
+FILES_${PN}-dbg += "${libdir}/NetworkManager/.debug/ \
+		    ${libdir}/pppd/*/.debug/ "
 
 FILES_${PN}-dev += " ${datadir}/NetworkManager/gdb-cmd "
 
diff --git a/packages/networkmanager/networkmanager_0.6.5.bb b/packages/networkmanager/networkmanager_0.6.5.bb
index e6d21de286..2817124887 100644
--- a/packages/networkmanager/networkmanager_0.6.5.bb
+++ b/packages/networkmanager/networkmanager_0.6.5.bb
@@ -1,6 +1,6 @@
 require networkmanager.inc
 
-PR = "r0"
+PR = "r2"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${PV}.tar.bz2 \
 	  file://NetworkManager \
diff --git a/packages/networkmanager/networkmanager_svn.bb b/packages/networkmanager/networkmanager_svn.bb
index 610bd01e7e..e6bd318063 100644
--- a/packages/networkmanager/networkmanager_svn.bb
+++ b/packages/networkmanager/networkmanager_svn.bb
@@ -7,31 +7,31 @@ DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp"
 RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client"
 
 PV = "0.7+svnr${SRCREV}"
-PR = "r2"
+PR = "r5"
 
 SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
 	file://no-restarts.diff;patch=1;pnum=0 \
 	file://25NetworkManager \
 	file://99_networkmanager"
 
+S = "${WORKDIR}/trunk"
+
 EXTRA_OECONF = " \
 		--with-distro=debian \
-		--with-ip=/sbin/ip"
-# TODO: will /bin/ip from busybox do?
-
-S = "${WORKDIR}/trunk"
+		--with-ip=/sbin/ip.iproute2"
 
 inherit autotools pkgconfig
 
+do_stage () {
+	autotools_stage_all
+}
+
 do_install_append () {
 	install -d ${D}/etc/default/volatiles
 	install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles
 	install -d ${D}/etc/dbus-1/event.d
 	install -m 0755 ${WORKDIR}/25NetworkManager ${D}/etc/dbus-1/event.d
-}
-
-do_stage () {
-	autotools_stage_all
+	sed -i s,/sbin/ip,/sbin/ip.iproute2, ${D}/etc/init.d/NetworkManager
 }
 
 pkg_postinst () {
@@ -41,15 +41,17 @@ pkg_postinst () {
         /etc/init.d/populate-volatile.sh update
 }
 
-PACKAGES =+ "libnmutil libnmglib"
+PACKAGES =+ "libnmutil libnmglib libnmglib-vpn" 
 
 FILES_libnmutil += "${libdir}/libnm-util.so.*"
-
 FILES_libnmglib += "${libdir}/libnm_glib.so.*"
+FILES_libnmglib-vpn += "${libdir}/libnm_glib_vpn.so.*"
+
+FILES_${PN} += " \
+		${libexecdir} \
+		${libdir}/pppd/*/nm-pppd-plugin.so \
+		${libdir}/NetworkManager/*.so"
+FILES_${PN}-dbg += "${libdir}/NetworkManager/.debug/ \
+		    ${libdir}/pppd/*/.debug/ "
+FILES_${PN}-dev += " ${datadir}/NetworkManager/gdb-cmd "
 
-FILES_${PN}-dev = "${includedir}/* \
-        ${libdir}/*.so \
-        ${libdir}/*.a \
-        ${libdir}/pkgconfig/*.pc \
-        ${datadir}/NetworkManager/gdb-cmd \
-        "