Merge commit 'origin/shr/merge' into shr/testing2009

Conflicts:
	conf/distro/include/sane-srcrevs.inc
	recipes/enotes/enotes_svn.bb
	recipes/intone-video/intone-video_svn.bb
	recipes/intone/intone_svn.bb
	recipes/shr/shr-wizard_git.bb
	recipes/tasks/task-shr-minimal.bb

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>

7 files changed, 169 insertions, 10 deletions

diff --git a/recipes/e17/e-tasks_svn.bb b/recipes/e17/e-tasks_svn.bb
index 4f27744717..5c07a1bd3c 100644
--- a/recipes/e17/e-tasks_svn.bb
+++ b/recipes/e17/e-tasks_svn.bb
@@ -1,15 +1,29 @@
-DESCRIPTION = "tasks app for openmoko phones based on elementary"
+DESCRIPTION = "e-tasks is a todo program for Openmoko phones"
 HOMEPAGE = "http://code.google.com/p/e-tasks/"
 AUTHOR = "cchandel"
 LICENSE = "GPLv2"
 SECTION = "e/apps"
-#DEPENDS = "elementary eina edbus"
+DEPENDS = "elementary eina edbus sqlite3"
+
+inherit autotools
 
 PV = "0.0.1+svnr${SRCPV}"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "svn://e-tasks.googlecode.com/svn/trunk;module=.;proto=http"
-S = "${WORKDIR}"
+SRC_URI = "svn://e-tasks.googlecode.com/svn;module=trunk;proto=http"
+S = "${WORKDIR}/trunk"
 
-inherit autotools
+do_install_append() {
+        install -d "${D}/${datadir}/pixmaps"
+        install -m 0644 "${S}/resources/e-tasks.png" "${D}/${datadir}/pixmaps"
+        install -d "${D}/${datadir}/applications"
+        install -m 0644 "${S}/resources/e-tasks.desktop" "${D}/${datadir}/applications"
+        install -d  "${D}/${datadir}/e-tasks"
+        for ico in "${S}/resources/"*.png; do
+                if [ "$(basename $ico)" != "e-tasks.png" ]; then
+                        install -m 0644 $ico "${D}/${datadir}/e-tasks"
+                fi
+        done
+}
 
+FILES_${PN} += "/usr/share/e-tasks/* /usr/share/applications/* /usr/share/pixmaps/*"
diff --git a/recipes/e17/e-wm/drop-illume-keyboards.patch b/recipes/e17/e-wm/drop-illume-keyboards.patch
new file mode 100644
index 0000000000..0abe6f2a21
--- /dev/null
+++ b/recipes/e17/e-wm/drop-illume-keyboards.patch
@@ -0,0 +1,17 @@
+Index: e/src/modules/illume/keyboards/Makefile.am
+===================================================================
+--- e/src/modules/illume/keyboards/Makefile.am	(revision 43437)
++++ e/src/modules/illume/keyboards/Makefile.am	(working copy)
+@@ -4,12 +4,6 @@
+ filesdir = $(libdir)/enlightenment/modules/$(MODULE)/keyboards
+ files_DATA = \
+             ignore_built_in_keyboards \
+-            Default.kbd \
+-            alpha.png \
+-	    Numbers.kbd \
+-            numeric.png \
+-            Terminal.kbd \
+-	    qwerty.png \
+ 	    up.png \
+ 	    down.png \
+ 	    left.png \
diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb
index f31253be9e..0d86575550 100644
--- a/recipes/e17/e-wm_svn.bb
+++ b/recipes/e17/e-wm_svn.bb
@@ -3,7 +3,7 @@ DEPENDS = "eet evas ecore edje efreet edbus"
 LICENSE = "MIT BSD"
 SRCNAME = "e"
 PV = "0.16.999.060+svnr${SRCPV}"
-PR = "r8"
+PR = "r9"
 
 inherit e update-alternatives
 
@@ -13,6 +13,7 @@ SRC_URI += "\
   file://gsm-segfault-fix.patch;patch=1;maxrev=37617 \
   file://fix-profiles.diff;patch=1;maxrev=39889 \
   file://illume-flow.patch;patch=0;maxrev=43852 \
+  file://drop-illume-keyboards.patch;patch=1 \
 "
 
 SRC_URI_append_openmoko = " file://illume-disable-screensaver.patch;patch=1"
@@ -147,7 +148,13 @@ FILES_${PN}-utils = "${libdir}/enlightenment/utils/*"
 FILES_${PN}-menu = "${sysconfdir}/xdg/menus/applications.menu"
 
 RRECOMMENDS_${PN}-config-default = "${PN}-theme-default"
-RRECOMMENDS_${PN}-config-illume = "${PN}-theme-illume"
+RRECOMMENDS_${PN}-config-illume = "\
+  ${PN}-theme-illume \
+  illume-keyboard-default-alpha \
+  illume-keyboard-default-numeric \
+  illume-keyboard-default-terminal \
+"
+
 RRECOMMENDS_${PN}-config-minimalist = "\
   ${PN}-background-light-gradient \
   ${PN}-theme-default \
diff --git a/recipes/e17/elmdentica_svn.bb b/recipes/e17/elmdentica_svn.bb
index 5988d904ed..8549b009f0 100644
--- a/recipes/e17/elmdentica_svn.bb
+++ b/recipes/e17/elmdentica_svn.bb
@@ -5,7 +5,7 @@ SECTION = "e/apps"
 HOMEPAGE = "http://elmdentica.googlecode.com"
 AUTHOR = "seabra"
 PV = "0.7.0+svnr${SRCPV}"
-PR = "r0"
+PR = "r1"
  
  
 SRC_URI = "svn://elmdentica.googlecode.com/svn;module=trunk;proto=http"
diff --git a/recipes/e17/eve_svn.bb b/recipes/e17/eve_svn.bb
index d1a0e4775a..baa4a6cece 100644
--- a/recipes/e17/eve_svn.bb
+++ b/recipes/e17/eve_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = " Enlightenment webbrowser"
 LICENSE = "GPL"
 DEPENDS = "webkit-efl evas ecore edje"
 PV = "0.0.1+svnr${SRCPV}"
-PR = "r3"
+PR = "r4"
 
 LDFLAGS += "-lstdc++"
 
diff --git a/recipes/e17/illume-keyboard-default_svn.bb b/recipes/e17/illume-keyboard-default_svn.bb
new file mode 100644
index 0000000000..8b8dbd4a41
--- /dev/null
+++ b/recipes/e17/illume-keyboard-default_svn.bb
@@ -0,0 +1,43 @@
+DESCRIPTION = "The illume default keyboards"
+SECTION = "x11/data"
+SRCNAME = "e/src/modules/illume/keyboards"
+PV = "0.16.999.060+svnr${SRCPV}"
+PR = "r0"
+
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=${SRCNAME};proto=http"
+S = "${WORKDIR}/${SRCNAME}"
+
+PACKAGE_ARCH = "all"
+
+INSTPATH = "/enlightenment/modules/illume/keyboards"
+INSTFILES = "\
+Default.kbd \
+alpha.png \
+Numbers.kbd \
+numeric.png \
+Terminal.kbd \
+qwerty.png \
+"
+
+PACKAGES = "${PN}-alpha ${PN}-numeric ${PN}-terminal"
+
+FILES_${PN}-alpha = "\
+  ${libdir}${INSTPATH}/Default.kbd \
+  ${libdir}${INSTPATH}/alpha.png \
+"
+FILES_${PN}-numeric = "\
+  ${libdir}${INSTPATH}/Numeric.kbd \
+  ${libdir}${INSTPATH}/numeric.png \
+"
+FILES_${PN}-terminal = "\
+  ${libdir}${INSTPATH}/Terminal.kbd \
+  ${libdir}${INSTPATH}/qwerty.png \
+"
+
+do_install() {
+	install -d ${D}${libdir}${INSTPATH}
+	for f in ${INSTFILES}; do
+		install -m 0644 ${S}/${f} ${D}${libdir}${INSTPATH}
+	done
+}
+
diff --git a/recipes/e17/illume-keyboards-shr_git.bb b/recipes/e17/illume-keyboards-shr_git.bb
new file mode 100644
index 0000000000..109dc51a54
--- /dev/null
+++ b/recipes/e17/illume-keyboards-shr_git.bb
@@ -0,0 +1,78 @@
+SECTION = "x11/data"
+
+SRC_URI = "git://git.shr-project.org/repo/illume-keyboards.git;protocol=http;branch=master"
+S = "${WORKDIR}/git"
+
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
+PR = "r1"
+
+
+PACKAGES = "\
+illume-keyboard-arabic \
+illume-keyboard-browse \
+illume-keyboard-danish \
+illume-keyboard-default-alt \
+illume-keyboard-dutch \
+illume-keyboard-dvorak \
+illume-keyboard-french \
+illume-keyboard-german \
+illume-keyboard-hebrew \
+illume-keyboard-numeric-alt \
+illume-keyboard-russian \
+illume-keyboard-russian-terminal \
+"
+
+PACKAGE_ARCH = "all"
+
+AUTHOR_illume-keyboard-arabic = "Mohammad Fahmi / Tom Hacohen"
+DESCRIPTION_illume-keyboard-arabic = "Illume keyboard with arabic layout"
+FILES_illume-keyboard-arabic = "${libdir}/enlightenment/modules/illume/keyboards/arabic"
+
+AUTHOR_illume-keyboard-browse = "Pander"
+DESCRIPTION_illume-keyboard-browse = "Illume keyboard with a layout optimized for browsing"
+FILES_illume-keyboard-browse = "${libdir}/enlightenment/modules/illume/keyboards/browse"
+
+AUTHOR_illume-keyboard-danish = "Esben Damgaard"
+DESCRIPTION_illume-keyboard-danish = "Illume keyboard with danish layout"
+FILES_illume-keyboard-danish = "${libdir}/enlightenment/modules/illume/keyboards/danish"
+
+AUTHOR_illume-keyboard-default-alt = "Pander"
+DESCRIPTION_illume-keyboard-default-alt = "Illume keyboard with an alternative default layout"
+FILES_illume-keyboard-default-alt = "${libdir}/enlightenment/modules/illume/keyboards/default-alt"
+
+AUTHOR_illume-keyboard-dutch = "Pander"
+DESCRIPTION_illume-keyboard-dutch = "Illume keyboard with dutch layout"
+FILES_illume-keyboard-dutch = "${libdir}/enlightenment/modules/illume/keyboards/dutch"
+
+AUTHOR_illume-keyboard-dvorak = "Gabor Adam TOTH"
+DESCRIPTION_illume-keyboard-dvorak = "Illume keyboard with dvorak layout"
+FILES_illume-keyboard-dvorak = "${libdir}/enlightenment/modules/illume/keyboards/dvorak"
+
+DESCRIPTION_illume-keyboard-french = "Illume keyboard with french layout"
+FILES_illume-keyboard-french = "${libdir}/enlightenment/modules/illume/keyboards/french"
+
+AUTHOR_illume-keyboard-german = "Florian Hackenberger"
+DESCRIPTION_illume-keyboard-german = "Illume keyboard with german layout"
+FILES_illume-keyboard-german = "${libdir}/enlightenment/modules/illume/keyboards/german"
+
+AUTHOR_illume-keyboard-hebrew = "Tom Hacohen"
+DESCRIPTION_illume-keyboard-hebrew = "Illume keyboard with hebrew layout"
+FILES_illume-keyboard-hebrew = "${libdir}/enlightenment/modules/illume/keyboards/hebrew"
+
+AUTHOR_illume-keyboard-numeric-alt = "Pander"
+DESCRIPTION_illume-keyboard-numeric-alt = "Illume keyboard with an alternative numeric layout"
+FILES_illume-keyboard-numeric-alt = "${libdir}/enlightenment/modules/illume/keyboards/numeric-alt"
+
+AUTHOR_illume-keyboard-russian = "lucky"
+DESCRIPTION_illume-keyboard-russian = "Illume keyboard with russian layout"
+FILES_illume-keyboard-russian = "${libdir}/enlightenment/modules/illume/keyboards/russian"
+
+AUTHOR_illume-keyboard-russian-terminal = "lucky"
+DESCRIPTION_illume-keyboard-russian-terminal = "Illume keyboard with russian layout for the Terminal"
+FILES_illume-keyboard-russian-terminal = "${libdir}/enlightenment/modules/illume/keyboards/russian-terminal"
+
+do_install() {
+	make DESTDIR=${D} install
+}
+