More merging with OE. Fix settings-daemon depends.

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

diff --git a/openembedded/conf/distro/openzaurus.inc b/openembedded/conf/distro/openzaurus.conf
similarity index 100%
rename from openembedded/conf/distro/openzaurus.inc
rename to openembedded/conf/distro/openzaurus.conf

diff --git a/openembedded/packages/matchbox-panel/matchbox-panel.inc b/openembedded/packages/matchbox-panel/matchbox-panel.inc
new file mode 100644 (file)
index 0000000..58f42ef
--- /dev/null
+++ b/openembedded/packages/matchbox-panel/matchbox-panel.inc
@@ -0,0 +1,22 @@
+DESCRIPTION = "Matchbox Window Manager Panel"
+LICENSE = "GPL"
+DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel wireless-tools"
+SECTION = "x11/wm"
+
+inherit autotools pkgconfig gettext
+
+CFLAGS += "-D_GNU_SOURCE"
+
+EXTRA_OECONF = " --enable-startup-notification --enable-dnotify "
+EXTRA_OECONF_append_h3600 = " --enable-small-icons "
+EXTRA_OECONF_append_h3900 = " --enable-small-icons "
+EXTRA_OECONF_append_h2200 = " --enable-small-icons "
+EXTRA_OECONF_append_collie = " --enable-small-icons "
+EXTRA_OECONF_append_poodle = " --enable-small-icons "
+EXTRA_OECONF_append_mnci = " --enable-small-icons "
+EXTRA_OECONF_append_integral = " --enable-small-icons "
+
+FILES_${PN} = "${bindir} \
+              ${datadir}/applications \
+              ${datadir}/pixmaps"
+