merge of '367c12212e0958deb4779abbb80a10a6bd71e208'

     and '9efbf30d62a0b59fefb30c23ea0e41390a2ef60e'

5 files changed, 25 insertions, 12 deletions

diff --git a/packages/gpephone/gpe-applauncher/.mtn2git_empty b/packages/gpephone/gpe-applauncher/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpephone/gpe-applauncher/.mtn2git_empty
diff --git a/packages/gpephone/gpe-applauncher_0.10.bb b/packages/gpephone/gpe-applauncher_0.10.bb
index fbc47bd091..94f26c5589 100644
--- a/packages/gpephone/gpe-applauncher_0.10.bb
+++ b/packages/gpephone/gpe-applauncher_0.10.bb
@@ -2,11 +2,24 @@ LICENSE     = "GPL"
 DESCRIPTION = "A cellphone application launcher."
 SECTION = "gpe"
 PRIORITY    = "optional"
-PR          = "r0"
+PR          = "r1"
+
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
+
+PACKAGES += "gpe-applauncher-config"
+PACKAGE_ARCH_gpe-applauncher-config_fic-gta01 = "${MACHINE_ARCH}"
 
 DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings libxsettings-client"
+RDEPENDS_${PN} += "gpe-applauncher-config"
 
 GPE_TARBALL_SUFFIX= "bz2"
 inherit gpephone autotools
 
-FILES_${PN} += '${datadir}/themes'
+SRC_URI += "file://hotkeys.conf"
+
+FILES_${PN} = '${datadir} ${bindir}'
+FILES_gpe-applauncher-config = '${sysconfdir}/gpe/'
+
+do_configure_append () {
+	install ${WORKDIR}/hotkeys.conf ${S}
+}
diff --git a/packages/gpephone/gpe-session-scripts-phone/phonesession b/packages/gpephone/gpe-session-scripts-phone/phonesession
index ee187e2fb0..2f573a13fa 100755
--- a/packages/gpephone/gpe-session-scripts-phone/phonesession
+++ b/packages/gpephone/gpe-session-scripts-phone/phonesession
@@ -47,8 +47,6 @@ gpe-phonepanel&
 gpe-applauncher&
 matchbox-window-manager -use_titlebar no&
 
-# start device support daemon
-machined
 
 # Start E-Sound Server
 esd -nobeeps -as 2&
@@ -65,5 +63,8 @@ gsmMux -d -p /dev/ttyS0 -m cms92 -f 128 -b 115200 -c /dev/ptmx /dev/ptmx &
 #save session bus address to a file
 echo $DBUS_SESSION_BUS_ADDRESS > /tmp/dbusaddress
 
-# Start PhoneServer - do not stop, it keeps the session running
-exec phoneserver
+# Start PhoneServer
+phoneserver&
+
+# start device support daemon
+exec machined -n
diff --git a/packages/gpephone/gpe-session-scripts-phone_0.67.bb b/packages/gpephone/gpe-session-scripts-phone_0.67.bb
index 4cedeaa7f8..ac867a9c02 100644
--- a/packages/gpephone/gpe-session-scripts-phone_0.67.bb
+++ b/packages/gpephone/gpe-session-scripts-phone_0.67.bb
@@ -14,7 +14,7 @@ SRC_URI = "${GPE_MIRROR}/gpe-session-scripts-${PV}.tar.gz \
 	   file://disable-composite.xsettings \
            file://standard-apps.patch;patch=1"
 
-PR = "r8"
+PR = "r9"
 
 S = "${WORKDIR}/gpe-session-scripts-${PV}"
 
diff --git a/packages/tasks/task-sdk-extra.bb b/packages/tasks/task-sdk-extra.bb
index 33f8e3a5e8..efb12c3cfb 100644
--- a/packages/tasks/task-sdk-extra.bb
+++ b/packages/tasks/task-sdk-extra.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SDK packages"
-PR = "r7"
+PR = "r8"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
@@ -18,6 +18,7 @@ RDEPENDS_task-sdk-x11 = "\
     libmatchbox-dev \
     matchbox-desktop-dev \
     pango-dev \
+    renderproto-dev \
     startup-notification-dev"
 
 RDEPENDS_task-sdk-x11-ext = "\
@@ -28,10 +29,7 @@ RDEPENDS_task-sdk-x11-ext = "\
     libxrender-dev \
     libxsettings-client-dev \
     randrext-dev \
-    resourceext-dev \
-    libx11-dev \
     libxau-dev \
-    libxcalibrate-dev \
     xcalibrateext-dev \
     libxcomposite-dev \
     libxdamage-dev \
@@ -53,5 +51,6 @@ RDEPENDS_task-sdk-gpe = "\
     libgpevtype-dev \
     libgpelaunch-dev \
     libgpewidget-dev \
-    libhandoff-dev"
+    libhandoff-dev \
+    gconf-dbus-dev"