merge of '4dc83fb2fe7f6a2d1912363f0f5d575ef277a6b7'

     and '6db51d8148c7ab6620fa15c71ccbfc4ec1db4fc0'

5 files changed, 16 insertions, 59 deletions

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/configure-keyboard.patch b/packages/openmoko-projects/illume/configure-keyboard.patch
deleted file mode 100644
index 589fe53f38..0000000000
--- a/packages/openmoko-projects/illume/configure-keyboard.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: configure.in
-===================================================================
---- configure.in	(Revision 170)
-+++ configure.in	(Arbeitskopie)
-@@ -95,6 +95,21 @@
- AC_SUBST(e_libs)
- AC_SUBST(e_modules)
- 
-+want_illume_virtual_keyboard=no
-+AC_ARG_ENABLE(illume-keyboard,
-+    AC_HELP_STRING(
-+        [--enable-illume-keyboard],
-+        [Enable the illume virtual keyboard.]
-+    ),
-+    [want_illume_virtual_keyboard=$enableval]
-+    )
-+AC_MSG_CHECKING(whether the illume virtual keyboard is to be built in)
-+AC_MSG_RESULT($want_illume_virtual_keyboard)
-+
-+if test "x$want_illume_virtual_keyboard" = "xyes"; then
-+    AC_DEFINE(BUILD_ILLUME_VIRTUAL_KEYBOARD, 1, [Build the virtual keyboard in])
-+fi
-+
- AC_OUTPUT([
- Makefile
- src/Makefile
-Index: src/e_mod_win.c
-===================================================================
---- src/e_mod_win.c	(Revision 170)
-+++ src/e_mod_win.c	(Arbeitskopie)
-@@ -102,7 +102,7 @@
- 		    e_module_dir_get(m),
- 		    e_module_dir_get(m));
-    // FIXME: run kbd app or use internal
--#if 0
-+#ifdef BUILD_ILLUME_VIRTUAL_KEYBOARD
-    //enable for now to test internal kbd
-    vkbd_int = e_kbd_int_new(e_module_dir_get(m),
- 			    e_module_dir_get(m),
diff --git a/packages/openmoko-projects/illume/module.illume.src b/packages/openmoko-projects/illume/module.illume.src
deleted file mode 100644
index 2657ca3dd8..0000000000
--- a/packages/openmoko-projects/illume/module.illume.src
+++ /dev/null
@@ -1,17 +0,0 @@
-group "Illume_Cfg" struct {
-  value "config_version" int: 1;
-  value "launcher.mode" int: 1;
-  value "launcher.icon_size" int: 120;
-  value "launcher.single_click" int: 1;
-  value "power.auto_suspend" int: 1;
-  value "power.auto_suspend_delay" int: 1;
-  value "performance.cache_level" int: 3;
-  value "performance.fps" int: 25;
-  value "slipshelf.main_gadget_size" int: 42;
-  value "slipshelf.extra_gagdet_size" int: 32;
-  value "sliding.slipshelf.duration" int: 1000;
-  value "sliding.kbd.duration" int: 1000;
-  value "sliding.busywin.duration" int: 1000;
-  value "sliding.layout.duration" int: 0;
-  value "kbd.use_internal" int: 1;
-}
diff --git a/packages/openmoko-projects/illume_svn.bb b/packages/openmoko-projects/illume_svn.bb
index 5f4127b5ab..d7b6233edf 100644
--- a/packages/openmoko-projects/illume_svn.bb
+++ b/packages/openmoko-projects/illume_svn.bb
@@ -1,13 +1,13 @@
 DESCRIPTION = "Illume - A mobile UI module for the Enlightenment Window Manager"
 HOMEPAGE = "http://illume.projects.openmoko.org"
-AUTHOR = "Rasterman"
+AUTHOR = "Carsten 'Rasterman' Haitzler"
 LICENSE = "MIT/BSD"
 DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native eet-native"
 PV = "0.0+svnr${SRCREV}"
-PR = "r11"
+PR = "r12"
 
 SRC_URI = "\
-  svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=http \
+  svn://svn.enlightenment.org/svn/e/trunk/;module=${PN};proto=http \
   file://configure-keyboard.patch;patch=1;pnum=0;maxrev=170 \
   file://module.illume.src \
 "
diff --git a/packages/openmoko-projects/tichy_svn.bb b/packages/openmoko-projects/tichy_svn.bb
new file mode 100644
index 0000000000..0b42fc6f70
--- /dev/null
+++ b/packages/openmoko-projects/tichy_svn.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Python applets manager"
+SECTION = "x11"
+LICENSE = "GPL"
+DEPENDS = "python-pygame"
+PV = "0.1+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot;module=tichy;proto=http"
+S = "${WORKDIR}/tichy"
+
+inherit distutils
+
+FILES_${PN} += "${datadir}"