merge of '3e3e5c3190f2cb2e6fbed584c5049e73df49c04e'

     and 'b7c57ac566ade9b73a2dc88a9400d0667d979c84'

6 files changed, 51 insertions, 64 deletions

diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb
index 20c655e98d..f26b0a282d 100644
--- a/packages/freesmartphone/frameworkd_git.bb
+++ b/packages/freesmartphone/frameworkd_git.bb
@@ -5,7 +5,7 @@ SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
 PV = "0.8.1+gitr${SRCREV}"
-PR = "r9"
+PR = "r10"
 
 inherit distutils update-rc.d
 
@@ -34,7 +34,16 @@ RDEPENDS_${PN} += "\
   python-pyyaml \
   python-shell \
   python-syslog \
+  \
+  ${PN}-config \
 "
 
-FILES_${PN} += "${sysconfdir} ${datadir}"
+
+PACKAGES =+ "${PN}-config"
+
+PACKAGE_ARCH_${PN}-config = "${MACHINE_ARCH}"
+FILES_${PN}-config = "${sysconfdir}"
+
+PACKAGE_ARCH_${PN} = "${BASE_PACKAGE_ARCH}"
+FILES_${PN} += "${datadir}"
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/framework/subsystems/*/.debug"
diff --git a/packages/openmoko-projects/illume/.mtn2git_empty b/packages/openmoko-projects/illume/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/openmoko-projects/illume/.mtn2git_empty
+++ /dev/null
diff --git a/packages/openmoko-projects/illume_svn.bb b/packages/openmoko-projects/illume_svn.bb
index f3fb611e09..b58bc2c1d6 100644
--- a/packages/openmoko-projects/illume_svn.bb
+++ b/packages/openmoko-projects/illume_svn.bb
@@ -1,25 +1,50 @@
-DESCRIPTION = "Illume - Mobile UI module for Enlightenment"
-HOMEPAGE = "http://illume.projects.openmoko.org/"
+DESCRIPTION = "Illume - A mobile UI module for the Enlightenment Window Manager"
+HOMEPAGE = "http://illume.projects.openmoko.org"
+AUTHOR = "Rasterman"
 LICENSE = "MIT/BSD"
 DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native"
-RRECOMMENDS = "wamerican"
 PV = "0.0+svnr${SRCREV}"
-PR = "r6"
-
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https"
+PR = "r7"
 
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=http"
 S = "${WORKDIR}/${PN}"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
-                --x-libraries=${STAGING_LIBDIR} \
-                --enable-simple-x11 \
-                --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+EXTRA_OECONF = "\
+  --x-includes=${STAGING_INCDIR}/X11 \
+  --x-libraries=${STAGING_LIBDIR} \
+  --enable-simple-x11 \
+  --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+"
+
+RRECOMMENDS_${PN} = "\
+  wamerican \
+  ${PN}-config \
+  ${PN}-dicts-default \
+  ${PN}-keyboards-default \
+  ${PN}-keyboards-numbers \
+"
+
+PACKAGES =+ "\
+  ${PN}-config \
+  ${PN}-dicts-default \
+  ${PN}-keyboards-default \
+  ${PN}-keyboards-numbers \
+"
+PACKAGE_ARCH_${PN}-config = "all"
+PACKAGE_ARCH_${PN}-dicts-default = "all"
+PACKAGE_ARCH_${PN}-keyboards-default = "all"
+PACKAGE_ARCH_${PN}-keyboards-numbers = "all"
+
+FILES_${PN}-config = "${datadir}/enlightenment/data/config/*/* ${datadir}/illume"
+FILES_${PN}-dicts-default = "${libdir}/enlightenment/modules/illume/dicts/Default.dic"
+FILES_${PN}-keyboards-default = "${libdir}/enlightenment/modules/illume/keyboards/Default.kbd"
+FILES_${PN}-keyboards-numbers = "${libdir}/enlightenment/modules/illume/keyboards/Numbers.kbd"
 
-FILES_${PN} = "${libdir}/enlightenment/modules/*/*.edj \
-               ${libdir}/enlightenment/modules/*/*.desktop \
-               ${libdir}/enlightenment/modules/*/*/* \
-               ${datadir}/enlightenment/data/config/*/* \
-               ${datadir}/${PN} "
+FILES_${PN} = "\
+  ${libdir}/enlightenment/modules/*/*.edj \
+  ${libdir}/enlightenment/modules/*/*.desktop \
+  ${libdir}/enlightenment/modules/*/*/* \
+"
 FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/"
diff --git a/packages/openmoko-projects/tangogps/.mtn2git_empty b/packages/openmoko-projects/tangogps/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/openmoko-projects/tangogps/.mtn2git_empty
+++ /dev/null
diff --git a/packages/openmoko-projects/tangogps/global-config-h.patch b/packages/openmoko-projects/tangogps/global-config-h.patch
deleted file mode 100644
index 973710c942..0000000000
--- a/packages/openmoko-projects/tangogps/global-config-h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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/tangogps_0.7.bb b/packages/openmoko-projects/tangogps_0.7.bb
deleted file mode 100644
index 63513ffe00..0000000000
--- a/packages/openmoko-projects/tangogps_0.7.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-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/"