merge of '0b604857bbf871639fdb43ee8380222e8ef64bb7'

     and 'f2611b9289af3945942b74edcc7ef91fb0a597bd'

10 files changed, 140 insertions, 0 deletions

diff --git a/packages/openmoko-projects.merge/.mtn2git_empty b/packages/openmoko-projects.merge/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko-projects.merge/.mtn2git_empty
diff --git a/packages/openmoko-projects.merge/assassin_svn.bb b/packages/openmoko-projects.merge/assassin_svn.bb
new file mode 100644
index 0000000000..987d44070d
--- /dev/null
+++ b/packages/openmoko-projects.merge/assassin_svn.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Action GUI for Installer"
+HOMEPAGE = "http://assassin.projects.openmoko.org/"
+LICENSE = "GPL"
+DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus"
+PV = "0.2+svn${SRCREV}"
+PR = "r4"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https"
+
+S = "${WORKDIR}/assassin"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = ""
+
+FILES_${PN} += "${prefix}/share/*"
diff --git a/packages/openmoko-projects.merge/diversity-daemon_svn.bb b/packages/openmoko-projects.merge/diversity-daemon_svn.bb
new file mode 100644
index 0000000000..02e1ea29bb
--- /dev/null
+++ b/packages/openmoko-projects.merge/diversity-daemon_svn.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Diveristy Daemon"
+HOMEPAGE = "http://diversity.projects.openmoko.org/"
+SECTION = "net/misc"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus libjana curl"
+RDEPENDS = "eds-dbus openmoko-dialer2"
+PV = "0.0+svnr${SRCREV}"
+PR = "r2"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https"
+
+S = "${WORKDIR}/diversity-daemon"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-nm --disable-xmpp --enable-session-bus"
+
+FILES_${PN} += "${datadir}/dbus-1/"
+FILES_${PN} += "${sysconfdir}/dbus-1/"
diff --git a/packages/openmoko-projects.merge/diversity-nav_svn.bb b/packages/openmoko-projects.merge/diversity-nav_svn.bb
new file mode 100644
index 0000000000..23d6b4daf6
--- /dev/null
+++ b/packages/openmoko-projects.merge/diversity-nav_svn.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Diversity_nav - a GPS location based communicative application"
+HOMEPAGE = "http://diversity.projects.openmoko.org/"
+SECTION = "openmoko/applications"
+LICENSE = "GPL"
+DEPENDS = "evas edje ecore edbus"
+RDEPENDS = "diversity-daemon"
+PV = "0.0.1+svnr${SRCREV}"
+PR = "r2"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-nav;proto=https"
+
+S = "${WORKDIR}/diversity-nav"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
diff --git a/packages/openmoko-projects.merge/illume/.mtn2git_empty b/packages/openmoko-projects.merge/illume/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko-projects.merge/illume/.mtn2git_empty
diff --git a/packages/openmoko-projects.merge/illume/include-path.diff b/packages/openmoko-projects.merge/illume/include-path.diff
new file mode 100644
index 0000000000..0b5ed8add8
--- /dev/null
+++ b/packages/openmoko-projects.merge/illume/include-path.diff
@@ -0,0 +1,16 @@
+Include path fixes for Illume:
+
+$(includedir) is pointing to /usr/include, we do not want to have this when compiling
+
+Index: src/Makefile.am
+===================================================================
+--- a/src/Makefile.am	(Revision 12)
++++ b/src/Makefile.am	(Arbeitskopie)
+@@ -3,7 +3,6 @@
+ 
+ INCLUDES = -I. \
+ 	 -I$(top_srcdir) \
+-	 -I$(includedir) \
+ 	 @e_cflags@
+ 
+ pkgdir = $(datadir)/$(MODULE_ARCH)
diff --git a/packages/openmoko-projects.merge/illume_svn.bb b/packages/openmoko-projects.merge/illume_svn.bb
new file mode 100644
index 0000000000..f7dec16890
--- /dev/null
+++ b/packages/openmoko-projects.merge/illume_svn.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Illume - Mobile UI module for Enlightenment"
+DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native"
+LICENSE = "MIT BSD"
+PV = "svnr${SRCREV}"
+PR = "r1"
+
+inherit e
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https \
+           file://include-path.diff;patch=1"
+S = "${WORKDIR}/${PN}"
+
+EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
+                --x-libraries=${STAGING_LIBDIR} \
+		--enable-simple-x11 \
+                --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+                
+FILES_${PN} = "${libdir}/enlightenment/modules/*/*.edj ${libdir}/enlightenment/modules/*/*.desktop ${libdir}/enlightenment/modules/*/*/*"
+FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/"
+
+do_install_append() {
+  for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.la" -print`; do rm -f $I; done
+  for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.a" -print`; do rm -f $I; done
+  for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.la" -print`; do rm -f $I; done
+  for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.a" -print`; do rm -f $I; done
+}
diff --git a/packages/openmoko-projects.merge/tangogps/.mtn2git_empty b/packages/openmoko-projects.merge/tangogps/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko-projects.merge/tangogps/.mtn2git_empty
diff --git a/packages/openmoko-projects.merge/tangogps/global-config-h.patch b/packages/openmoko-projects.merge/tangogps/global-config-h.patch
new file mode 100644
index 0000000000..973710c942
--- /dev/null
+++ b/packages/openmoko-projects.merge/tangogps/global-config-h.patch
@@ -0,0 +1,30 @@
+Index: tangoGPS-0.7/src/globals.c
+===================================================================
+--- tangoGPS-0.7.orig/src/globals.c	2008-03-13 14:21:02.000000000 +0800
++++ tangoGPS-0.7/src/globals.c	2008-03-13 14:28:49.000000000 +0800
+@@ -3,11 +3,11 @@
+  *  License    GPLv2
+  ****************************************************************************/
+ 
++#include "globals.h"
++
+ #include <gtk/gtk.h>
+ #include <gps.h>
+ 
+-#include "globals.h"
+-
+ GdkPixmap *pixmap = NULL;
+ GtkWidget *window1 = NULL;
+ GtkWidget *window2 = NULL;
+Index: tangoGPS-0.7/src/globals.h
+===================================================================
+--- tangoGPS-0.7.orig/src/globals.h	2008-03-13 14:27:46.000000000 +0800
++++ tangoGPS-0.7/src/globals.h	2008-03-13 14:27:48.000000000 +0800
+@@ -1,3 +1,7 @@
++#ifdef HAVE_CONFIG_H
++#  include <config.h>
++#endif
++
+ #include <gtk/gtk.h>
+ #include <gconf/gconf-client.h>
+ 
diff --git a/packages/openmoko-projects.merge/tangogps_0.7.bb b/packages/openmoko-projects.merge/tangogps_0.7.bb
new file mode 100644
index 0000000000..63513ffe00
--- /dev/null
+++ b/packages/openmoko-projects.merge/tangogps_0.7.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "tangoGPS map"
+AUTHOR = "Marcus Bauer <marcus.bauer@gmail.com>"
+HOMEPAGE = "http://tangogps.org/"
+SECTION = "openmoko/pim"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+DEPENDS = "curl gtk+ gpsd"
+PR = "r1"
+
+SRC_URI = "http://tangogps.org/tangoGPS-0.7.tar.gz \
+           file://global-config-h.patch;patch=1"
+
+S = "${WORKDIR}/tangoGPS-0.7"
+
+inherit autotools
+
+CPPFLAGS += "-I${STAGING_INCDIR}/gconf/2/"