merge of '2727f9135b6cab138d8484eaefc8eda4afcfbc41'

     and '9bd8fd454a7f2f34cfe7e3a27b1f18aaab798336'

12 files changed, 147 insertions, 0 deletions

diff --git a/packages/dhcdbd/.mtn2git_empty b/packages/dhcdbd/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dhcdbd/.mtn2git_empty
diff --git a/packages/dhcdbd/dhcdbd_1.14.bb b/packages/dhcdbd/dhcdbd_1.14.bb
new file mode 100644
index 0000000000..f46543d2d4
--- /dev/null
+++ b/packages/dhcdbd/dhcdbd_1.14.bb
@@ -0,0 +1,26 @@
+DESCRIPTION="DBus-enabled dhcp client"
+SECTION="net"
+LICENSE="GPL"
+HOMEPAGE="http://people.redhat.com/jvdias/dhcdbd/"
+MAINTAINER="Milan Plzik <mmp@handhelds.org>"
+
+DEPENDS = "dbus"
+
+SRC_URI="http://people.redhat.com/jvdias/dhcdbd/dhcdbd-${PV}.tar.gz \
+         file://dhcdbd-1.14-pkgconfig_dbus.patch;patch=1\
+	 file://dhcdbd"
+
+do_configure() {
+}
+
+do_compile() {
+	CC=${TARGET_SYS}-gcc DESTDIR=${prefix} make
+}
+
+do_install() {
+	DESTDIR=${D} make install
+	install -d ${D}/etc/init.d
+	install -m 0755 ${WORKDIR}/dhcdbd ${D}/etc/init.d/
+}
+
+FILES_${PN}="${sysconfdir} ${datadir}/dbus-1 ${base_sbindir}"
diff --git a/packages/dhcdbd/files/.mtn2git_empty b/packages/dhcdbd/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dhcdbd/files/.mtn2git_empty
diff --git a/packages/dhcdbd/files/dhcdbd b/packages/dhcdbd/files/dhcdbd
new file mode 100755
index 0000000000..568753c28c
--- /dev/null
+++ b/packages/dhcdbd/files/dhcdbd
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# DHCDBD startup script
+
+. /etc/profile
+
+case $1 in
+  'start')
+    echo -n "Starting dhcdbd daemon: dhcdbd"
+    /sbin/dhcdbd --system
+    echo "."
+  ;;
+
+  'stop')
+    echo -n "Stopping dhcdbd: dhcdbd"
+    killall `ps |grep  /sbin/dhcdbd | grep -v grep | cut "-d " -f2`
+    echo "."
+  ;;
+
+  'restart')
+    $0 stop
+    $0 start
+  ;;
+
+  *)
+    echo "Usage: $0 { start | stop | restart }"
+  ;;
+esac
diff --git a/packages/dhcdbd/files/dhcdbd-1.14-pkgconfig_dbus.patch b/packages/dhcdbd/files/dhcdbd-1.14-pkgconfig_dbus.patch
new file mode 100644
index 0000000000..c2e2151d17
--- /dev/null
+++ b/packages/dhcdbd/files/dhcdbd-1.14-pkgconfig_dbus.patch
@@ -0,0 +1,26 @@
+diff -Naur dhcdbd-1.14/Makefile dhcdbd-1.14-mod/Makefile
+--- dhcdbd-1.14/Makefile	2006-01-17 22:23:51.000000000 +0100
++++ dhcdbd-1.14-mod/Makefile	2006-08-02 18:02:42.000000000 +0200
+@@ -7,8 +7,8 @@
+ LDFLAGS ?= -g
+ DESTDIR ?= /
+ LIBDIR  ?= lib
+-DBUS_INCLUDES ?= -I/usr/$(LIBDIR)/dbus-1.0/include -I/usr/include/dbus-1.0
+-DBUS_LIBS     ?= -ldbus-1
++DBUS_INCLUDES ?= `pkg-config dbus-1 --cflags`
++DBUS_LIBS     ?= `pkg-config dbus-1 --libs`
+ OBJS   =  dbus_service.o dhcdbd.o dhcp_options.o main.o
+ SRCS   =  dbus_service.c dhcdbd.c dhcp_options.c main.c
+ INCS   =  dbus_service.h dhcdbd.h dhcp_options.h includes.h 
+diff -Naur dhcdbd-1.14/tests/Makefile dhcdbd-1.14-mod/tests/Makefile
+--- dhcdbd-1.14/tests/Makefile	2006-01-17 22:23:51.000000000 +0100
++++ dhcdbd-1.14-mod/tests/Makefile	2006-08-02 18:11:43.000000000 +0200
+@@ -2,7 +2,7 @@
+ LD        = ${CC}
+ CFLAGS    ?= -g -Wall
+ LDFLAGS   ?= -g
+-DBUS_LIBS ?= -ldbus-1
++DBUS_LIBS ?= `pkg-config dbus-1 --libs`
+ 
+ all:	test_dhcp_options test_dhcdbd_state test_subscriber test_subscriber_dbus test_prospective_subscriber
+ 
diff --git a/packages/hicolor-icon-theme/hicolor-icon-theme_0.9.bb b/packages/hicolor-icon-theme/hicolor-icon-theme_0.9.bb
new file mode 100644
index 0000000000..2f7e21892a
--- /dev/null
+++ b/packages/hicolor-icon-theme/hicolor-icon-theme_0.9.bb
@@ -0,0 +1,7 @@
+SECTION = "unknown"
+LICENSE = "GPL"
+inherit gnome
+
+SRC_URI = "http://icon-theme.freedesktop.org/releases/${P}.tar.gz"
+
+FILES_${PN} += "${datadir}/icons"
diff --git a/packages/libhal-nm/.mtn2git_empty b/packages/libhal-nm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libhal-nm/.mtn2git_empty
diff --git a/packages/libhal-nm/libhal-nm_0.0.2.bb b/packages/libhal-nm/libhal-nm_0.0.2.bb
new file mode 100644
index 0000000000..661df4c23b
--- /dev/null
+++ b/packages/libhal-nm/libhal-nm_0.0.2.bb
@@ -0,0 +1,24 @@
+DESCRIPTION="A library emulating libhal on systems where HAL cannot run"
+SECTION="libs"
+LICENSE="LGPL"
+HOMEPAGE="http://www.handhelds.org/~mmp"
+MAINTAINER = "Milan Plzik <mmp@handhelds.org>"
+PRIORITY="optional"
+DEPENDS="glib-2.0"
+SRC_URI="http://www.handhelds.org/~mmp/files/libhal-nm-${PV}.tar.gz"
+
+inherit autotools
+
+do_stage () {
+	autotools_stage_all
+}
+
+do_install () {
+	oe_runmake DESTDIR=${D} install
+}
+
+PACKAGES="${PN} ${PN}-dev"
+
+FILES_${PN}="${libdir}"
+FILES_${PN}-dev="/usr/include"
+
diff --git a/packages/libnl/.mtn2git_empty b/packages/libnl/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libnl/.mtn2git_empty
diff --git a/packages/libnl/files/.mtn2git_empty b/packages/libnl/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libnl/files/.mtn2git_empty
diff --git a/packages/libnl/files/local-includes.patch b/packages/libnl/files/local-includes.patch
new file mode 100644
index 0000000000..5af463004b
--- /dev/null
+++ b/packages/libnl/files/local-includes.patch
@@ -0,0 +1,11 @@
+--- libnl-1.0-pre6/Makefile.opts.in.orig	2006-08-24 14:57:42.000000000 +0200
++++ libnl-1.0-pre6/Makefile.opts.in	2006-08-24 14:58:20.000000000 +0200
+@@ -10,7 +10,7 @@
+ #
+ 
+ CC               := @CC@
+-CFLAGS           := @CFLAGS@
++CFLAGS           := -I./include -I. -I../include @CFLAGS@
+ LDFLAGS          := @LDFLAGS@
+ CPPFLAGS         := @CPPFLAGS@
+ PACKAGE_NAME     := @PACKAGE_NAME@
diff --git a/packages/libnl/libnl_1.0-pre6.bb b/packages/libnl/libnl_1.0-pre6.bb
new file mode 100644
index 0000000000..3851c5687d
--- /dev/null
+++ b/packages/libnl/libnl_1.0-pre6.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "libnl is a library for applications dealing with netlink sockets"
+SECTION = "libs/network"
+LICENSE = "LGPL"
+HOMEPAGE = "http://people.suug.ch/~tgr/libnl/"
+MAINTAINER = "Milan Plzik <mmp@handhelds.org>"
+PRIORITY = "optional"
+DEPENDS = "glibc"
+
+inherit autotools pkgconfig gpe
+
+SRC_URI= "http://people.suug.ch/~tgr/libnl/files/${P}.tar.gz \
+           file://local-includes.patch;patch=1"
+
+do_install() {
+        oe_runmake prefix=${prefix} DESTDIR=${D} install
+}
+
+do_stage () {
+	autotools_stage_all prefix=${prefix}
+}
+
+do_install () {
+	oe_runmake prefix=${prefix} DESTDIR=${D} install
+}
+