[oe-commits] org.oe.dev networkmanager_0.6.5.bb, networkmanager.inc : an update from OM mtn

[xora commit]

networkmanager_0.6.5.bb, networkmanager.inc : an update from OM mtn

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: baab714da70279e064d25922b453dcfc000be586
ViewMTN: http://monotone.openembedded.org/revision/info/baab714da70279e064d25922b453dcfc000be586
Files:
1
packages/networkmanager/networkmanager.inc
packages/networkmanager/networkmanager_0.6.5.bb
Diffs:

#
# mt diff -r3f43406ba42c23ecf2e0fd2ae063db2b7bc66fc4 -rbaab714da70279e064d25922b453dcfc000be586
#
#
#
# patch "packages/networkmanager/networkmanager.inc"
#  from [1fda3eeff5fcb4c7cef4c98029cb884193f091d9]
#    to [9a93709e62dc590d2b4b7c3f8c4d0357c2a64b99]
# 
# patch "packages/networkmanager/networkmanager_0.6.5.bb"
#  from [c44eba44dd018961750b625359c57e42f53463aa]
#    to [b6f945c3ef7f135e07832220bac70bc8b91016d8]
#
============================================================
--- packages/networkmanager/networkmanager.inc	1fda3eeff5fcb4c7cef4c98029cb884193f091d9
+++ packages/networkmanager/networkmanager.inc	9a93709e62dc590d2b4b7c3f8c4d0357c2a64b99
@@ -5,9 +5,8 @@ RDEPENDS = "wpa-supplicant iproute2 dhcd
 PRIORITY = "optional"
 DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools"
 RDEPENDS = "wpa-supplicant iproute2 dhcdbd"
+PR = "r1"
 
-PR = "r0"
-
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${PV}.tar.bz2 \
 	  file://NetworkManager \
 	  file://99_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 "
 
============================================================
--- packages/networkmanager/networkmanager_0.6.5.bb	c44eba44dd018961750b625359c57e42f53463aa
+++ packages/networkmanager/networkmanager_0.6.5.bb	b6f945c3ef7f135e07832220bac70bc8b91016d8
@@ -1,6 +1,6 @@ require networkmanager.inc
 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 \