From 53a171468916a10de6b48671f9bd850585e43c04 Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 12 Sep 2007 13:42:39 +0000
Subject: gpe-session-scripts-phone: Minor session update to avoid session
 restart.

---
 packages/gpephone/gpe-session-scripts-phone/phonesession | 9 +++++----
 packages/gpephone/gpe-session-scripts-phone_0.67.bb      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'packages/gpephone')

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}"
 
-- 
cgit v1.2.3


From e31096d1a0fce8c7e58756ebde4917960ee35449 Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 12 Sep 2007 16:16:05 +0000
Subject: gpe-applauncher: Make a separate package for the machine specific
 configuration files.

---
 packages/gpephone/gpe-applauncher/.mtn2git_empty |  0
 packages/gpephone/gpe-applauncher_0.10.bb        | 17 +++++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 packages/gpephone/gpe-applauncher/.mtn2git_empty

(limited to 'packages/gpephone')

diff --git a/packages/gpephone/gpe-applauncher/.mtn2git_empty b/packages/gpephone/gpe-applauncher/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
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}
+}
-- 
cgit v1.2.3