merge of '76e1e69496801009ea0aa69c84f76e858978ab99'

     and 'db976a98427dd6a195e2cf167e225de2d0206aea'

4 files changed, 104 insertions, 0 deletions

diff --git a/packages/networkmanager/network-manager-applet_0.6.5.bb b/packages/networkmanager/network-manager-applet_0.6.5.bb
new file mode 100644
index 0000000000..fae5507989
--- /dev/null
+++ b/packages/networkmanager/network-manager-applet_0.6.5.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Frontend applet for NetworkManager" 
+LICENSE = "GPLv2"
+
+DEPENDS = "networkmanager dbus-glib libglade gconf gnome-keyring libnotify libgnomeui "
+
+inherit gnome
+
+S = "${WORKDIR}/nm-applet-${PV}"
+
+FILES_${PN} += "${datadir}/nm-applet/ \
+                ${datadir}/icons \
+		${datadir}/gnome \
+		"
+
diff --git a/packages/networkmanager/networkmanager.inc b/packages/networkmanager/networkmanager.inc
new file mode 100644
index 0000000000..e11a52391d
--- /dev/null
+++ b/packages/networkmanager/networkmanager.inc
@@ -0,0 +1,66 @@
+DESCRIPTION = "NetworkManager"
+SECTION = "net/misc"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.gnome.org"
+PRIORITY = "optional"
+DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools"
+RDEPENDS = "wpa-supplicant iproute2 dhcdbd"
+
+PR = "r0"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${PV}.tar.bz2 \
+	  file://NetworkManager \
+	  file://99_networkmanager"
+
+S = "${WORKDIR}/NetworkManager-${PV}/"
+
+
+EXTRA_OECONF = " \
+		--with-gnome \
+		--with-distro=debian \
+		--without-gcrypt \
+ 		--with-wpa_supplicant=/usr/sbin/wpa_supplicant \
+		--with-dhcdbd=/sbin/dhcdbd \
+		--with-ip=/sbin/ip"
+
+inherit autotools pkgconfig
+
+do_stage () {
+	autotools_stage_all
+}
+
+do_install () {
+	oe_libinstall -C libnm-util libnm-util ${D}/usr/lib
+	oe_libinstall -C gnome/libnm_glib libnm_glib ${D}/usr/lib
+
+	oe_runmake -C src DESTDIR="${D}" install
+	install -d ${D}/etc/default/volatiles
+	install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles
+	install -d ${D}/etc/init.d/
+	install -m 0755 ${WORKDIR}/NetworkManager ${D}/etc/init.d/
+	install -d ${D}/${datadir}/
+}
+
+pkg_postinst_${PN} () {
+if [ "x$D" != "x" ]; then
+        exit 1
+fi
+/etc/init.d/populate-volatile.sh update
+}
+
+PACKAGES =+ "libnmutil libnmglib" 
+
+FILES_libnmutil += "${libdir}/libnm-util.so.*"
+FILES_libnmglib += "${libdir}/libnm_glib.so.*"
+
+FILES_${PN} += "${datadir} \
+		${sbindir}/* \
+		${bindir}/* \
+		${sysconfdir} \
+		${libexecdir}"
+
+FILES_${PN}-dev += "${incdir} \
+		   ${libdir}/*.a \
+		   ${libdir}/*.la \
+		   ${libdir}/pkgconfig"
+
diff --git a/packages/networkmanager/networkmanager_0.6.5.bb b/packages/networkmanager/networkmanager_0.6.5.bb
new file mode 100644
index 0000000000..e6d21de286
--- /dev/null
+++ b/packages/networkmanager/networkmanager_0.6.5.bb
@@ -0,0 +1,10 @@
+require networkmanager.inc
+
+PR = "r0"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${PV}.tar.bz2 \
+	  file://NetworkManager \
+	  file://99_networkmanager"
+
+S = "${WORKDIR}/NetworkManager-${PV}/"
+
diff --git a/packages/networkmanager/networkmanager_svn.bb b/packages/networkmanager/networkmanager_svn.bb
new file mode 100644
index 0000000000..d879381975
--- /dev/null
+++ b/packages/networkmanager/networkmanager_svn.bb
@@ -0,0 +1,14 @@
+require networkmanager.inc
+
+PV = "0.6.5+svn${SRCDATE}"
+PR = "r0"
+
+SRC_URI="svn://svn.gnome.org/svn/NetworkManager/branches;module=NETWORKMANAGER_0_6_0_RELEASE;proto=http \
+	file://NetworkManager \
+	file://99_networkmanager"
+
+DEFAULT_PREFERENCE = "-1"
+
+S = "${WORKDIR}/NETWORKMANAGER_0_6_0_RELEASE"
+
+