merge of '76e1e69496801009ea0aa69c84f76e858978ab99'

     and 'db976a98427dd6a195e2cf167e225de2d0206aea'

41 files changed, 810 insertions, 52 deletions

diff --git a/packages/gpephone/addressbook_svn.bb b/packages/gpephone/addressbook_svn.bb
new file mode 100644
index 0000000000..663c38c09c
--- /dev/null
+++ b/packages/gpephone/addressbook_svn.bb
@@ -0,0 +1,19 @@
+LICENSE     = "LiPS"
+DESCRIPTION = "LiPS address book"
+SECTION = "gpe"
+PRIORITY    = "optional"
+PR          = "r0"
+PV = "0.1+svn-${SRCDATE}"
+
+DEFAULT_PREFERENCE = "-1"
+
+DEPENDS = "gtk+ libgpewidget libgpephone dbus-glib libabenabler libiac libim"
+
+inherit gpephone autotools
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = "${WORKDIR}/${PN}"
+
+
+FILES_${PN} += "${datadir}/database"
diff --git a/packages/gpephone/libim-0.1/.mtn2git_empty b/packages/gpephone/cms92init-0.1/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gpephone/libim-0.1/.mtn2git_empty
+++ b/packages/gpephone/cms92init-0.1/.mtn2git_empty
diff --git a/packages/gpephone/cms92init-0.1/oe-install.patch b/packages/gpephone/cms92init-0.1/oe-install.patch
new file mode 100644
index 0000000000..23e321c6bd
--- /dev/null
+++ b/packages/gpephone/cms92init-0.1/oe-install.patch
@@ -0,0 +1,9 @@
+--- cms92init-simple/Makefile~	2007-05-24 12:14:31.000000000 +0200
++++ cms92init-simple/Makefile	2007-05-24 12:14:31.000000000 +0200
+@@ -12,5 +12,5 @@
+ 	
+ install:
+ 	install -d $(DESTDIR)/$(PREFIX)/bin
+-	install -m755  cms92init $(DESTDIR)/$(PREFIX)/bin
++	install -m 755  cms92init $(DESTDIR)/$(PREFIX)/bin
+ 
diff --git a/packages/gpephone/cms92init_0.1.bb b/packages/gpephone/cms92init_0.1.bb
index ab0388a45d..4b943f4a6d 100644
--- a/packages/gpephone/cms92init_0.1.bb
+++ b/packages/gpephone/cms92init_0.1.bb
@@ -7,7 +7,8 @@ PR = "r0"
 
 inherit gpephone
 
-SRC_URI = "${GPEPHONE_MIRROR}/GPRS/GPRS-${PV}.tar.bz2"
+SRC_URI = "${GPEPHONE_MIRROR}/GPRS/GPRS-${PV}.tar.bz2 \
+           file://oe-install.patch;patch=1"
 
 
 S  = ${WORKDIR}/GPRS/cms92init-simple
diff --git a/packages/gpephone/connect_0.1.bb b/packages/gpephone/connect_0.1.bb
index c5ce0a0d54..a3171eef97 100644
--- a/packages/gpephone/connect_0.1.bb
+++ b/packages/gpephone/connect_0.1.bb
@@ -17,6 +17,6 @@ do_compile() {
 
 do_install() {
 	install -d  ${D}/${prefix}/bin
-        install -m755 connect ${D}/${prefix}/bin
-        install -m755 disconnect ${D}/${prefix}/bin
+        install -m 755 connect ${D}/${prefix}/bin
+        install -m 755 disconnect ${D}/${prefix}/bin
 }
diff --git a/packages/gpephone/gloox_0.8.1.bb b/packages/gpephone/gloox_0.8.1.bb
deleted file mode 100644
index 09004a8182..0000000000
--- a/packages/gpephone/gloox_0.8.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-LICENSE     = "GPL"
-DESCRIPTION = "full-featured Jabber/XMPP client library."
-SECTION = "networking"
-PRIORITY    = "optional"
-PR          = "r0"
-
-DEPENDS = "iksemel libidn gnutls"
-
-inherit autotools pkgconfig
-
-SRC_URI = "http://camaya.net/download/${P}.tar.bz2"
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/packages/gpephone/gpe-applauncher_0.8.bb b/packages/gpephone/gpe-applauncher_0.8.bb
new file mode 100644
index 0000000000..641511ad5b
--- /dev/null
+++ b/packages/gpephone/gpe-applauncher_0.8.bb
@@ -0,0 +1,12 @@
+LICENSE     = "GPL"
+DESCRIPTION = "A cellphone application launcher."
+SECTION = "gpe"
+PRIORITY    = "optional"
+PR          = "r0"
+
+DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings"
+
+GPE_TARBALL_SUFFIX= "bz2"
+inherit gpephone autotools
+
+FILES_${PN} += '${datadir}/themes'
diff --git a/packages/gpephone/gpe-applauncher_0.9.bb b/packages/gpephone/gpe-applauncher_0.9.bb
new file mode 100644
index 0000000000..fbc47bd091
--- /dev/null
+++ b/packages/gpephone/gpe-applauncher_0.9.bb
@@ -0,0 +1,12 @@
+LICENSE     = "GPL"
+DESCRIPTION = "A cellphone application launcher."
+SECTION = "gpe"
+PRIORITY    = "optional"
+PR          = "r0"
+
+DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings libxsettings-client"
+
+GPE_TARBALL_SUFFIX= "bz2"
+inherit gpephone autotools
+
+FILES_${PN} += '${datadir}/themes'
diff --git a/packages/gpephone/gpe-phonepanel_0.9.bb b/packages/gpephone/gpe-phonepanel_0.9.bb
new file mode 100644
index 0000000000..f9e2f04867
--- /dev/null
+++ b/packages/gpephone/gpe-phonepanel_0.9.bb
@@ -0,0 +1,12 @@
+LICENSE     = "GPL"
+DESCRIPTION = "A cellphone status panel to be used with gpe-applauncher."
+SECTION = "gpe"
+PRIORITY    = "optional"
+PR          = "r0"
+
+DEPENDS = "gtk+ libgpephone dbus-glib libsettings"
+
+GPE_TARBALL_SUFFIX= "bz2"
+inherit gpephone autotools
+
+FILES_${PN} += "${datadir}/themes"
diff --git a/packages/gpephone/gpe-session-scripts-phone/phonesession b/packages/gpephone/gpe-session-scripts-phone/phonesession
index 8fb5065d67..2dacc4c4c9 100755
--- a/packages/gpephone/gpe-session-scripts-phone/phonesession
+++ b/packages/gpephone/gpe-session-scripts-phone/phonesession
@@ -30,12 +30,27 @@ export	TINYMAIL_CACHE_DIR=$APP_PATH/share/tinymail.cache
 # For Calendar
 export	CAL_RES_PATH=$APP_PATH/share/res
 
+# For GTK input engine
+if [ -d /usr/lib/gtk-2.0/2.10.0 ]; then
+	export PTIM_PATH=/usr/lib/gtk-2.0/2.10.0/immodules/ptim
+else
+	export PTIM_PATH=/usr/lib/gtk-2.0/2.4.0/immodules/ptim
+fi
+
+export PTIM_PIXMAPS_PATH=$PTIM_PATH/pixmaps
+export PTIM_CONFIG_FILE=$PTIM_PATH/imconfig 
+export PTIM_HELPER_PATH=$PTIM_PATH/helper
+export PTIM_ENGINE_PATH=$PTIM_PATH/engine
+export GTK_IM_MODULE=ptim
+
 # Start GPE Phone Edition apps through matchbox session
-gpe-applauncher&
-sleep 2
 gpe-phonepanel&
+gpe-applauncher&
 matchbox-window-manager -use_titlebar no&
 
+# start device support daemon
+machined
+
 # Start E-Sound Server
 esd -nobeeps -as 2&
 esdplay /mnt/sd/sounds/startup.wav
@@ -48,5 +63,8 @@ soundserver &
 #cms92init &
 gsmMux -d -p /dev/ttyS0 -m cms92 -f 128 -b 115200 -c /dev/ptmx /dev/ptmx &
 
-# Start PhoneServer
-phoneserver
+#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
diff --git a/packages/gpephone/gpe-session-scripts-phone/standard-apps.patch b/packages/gpephone/gpe-session-scripts-phone/standard-apps.patch
new file mode 100644
index 0000000000..3be47c03b2
--- /dev/null
+++ b/packages/gpephone/gpe-session-scripts-phone/standard-apps.patch
@@ -0,0 +1,23 @@
+--- gpe-session-scripts/X11/Xsession.d/98standard-apps~	2007-04-18 18:54:59.000000000 +0200
++++ gpe-session-scripts/X11/Xsession.d/98standard-apps	2007-04-18 18:54:59.000000000 +0200
+@@ -7,20 +7,3 @@
+ else
+   time_set_already=no
+ fi
+-
+-# No action if .mbdock exists
+-if [ ! -f $HOME/.matchbox/mbdock.session ]; then
+-  mkdir -p $HOME/.matchbox
+-  cp /etc/gpe/gpe.mbdock $HOME/.matchbox/mbdock.session
+-
+-  if [ "$time_set_already" = "no" ]; then
+-    gpe-conf time user_only &
+-  fi
+-
+-  gpe-question --icon !gtk-dialog-info --question "<b>Welcome to GPE!</b>
+-
+-I have added some standard programs to the panel at the bottom of the screen.
+-
+-To remove these, or add more,  tap and hold on an empty area of the panel." --buttons !gtk-ok &
+-fi
+-
diff --git a/packages/gpephone/gpe-session-scripts-phone_0.67.bb b/packages/gpephone/gpe-session-scripts-phone_0.67.bb
index afa4fb1683..730a549aef 100644
--- a/packages/gpephone/gpe-session-scripts-phone_0.67.bb
+++ b/packages/gpephone/gpe-session-scripts-phone_0.67.bb
@@ -11,9 +11,10 @@ SRC_URI = "${GPE_MIRROR}/gpe-session-scripts-${PV}.tar.gz \
            file://matchbox-session \
            file://matchbox-session.vm \
            file://phonesession \
-	   file://disable-composite.xsettings"
+	   file://disable-composite.xsettings \
+           file://standard-apps.patch;patch=1"
 
-PR = "r2"
+PR = "r7"
 
 S = "${WORKDIR}/gpe-session-scripts-${PV}"
 
@@ -33,7 +34,7 @@ do_install_append() {
 	mv ${D}/usr/bin/gpe-logout ${D}/usr/bin/gpe-logout.matchbox
 
 	install -d ${D}${sysconfdir}/X11
-	install -m755 ${WORKDIR}/phonesession ${D}${sysconfdir}/X11/phonesession
+	install -m 755 ${WORKDIR}/phonesession ${D}${sysconfdir}/X11/phonesession
 }
 
 do_install_append_x86() {
diff --git a/packages/gpephone/iksemel_1.2.bb b/packages/gpephone/iksemel_1.2.bb
deleted file mode 100644
index 40ad32ce0e..0000000000
--- a/packages/gpephone/iksemel_1.2.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE     = "LGPL"
-DESCRIPTION = "A simple, powerful XML-parsing library written in C."
-SECTION = "libs"
-PRIORITY    = "optional"
-DEPENDS     = "glibc"
-PR          = "r0"
-
-inherit pkgconfig autotools
-
-SRC_URI = "http://files.jabberstudio.org/iksemel/${P}.tar.gz"
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/packages/gpephone/libabenabler_0.1.bb b/packages/gpephone/libabenabler_0.1.bb
index 7a8efb8382..c76d8f469b 100644
--- a/packages/gpephone/libabenabler_0.1.bb
+++ b/packages/gpephone/libabenabler_0.1.bb
@@ -1,5 +1,5 @@
 LICENSE     = "LGPL"
-DESCRIPTION = "LiPS event model library."
+DESCRIPTION = "LiPS address book library."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 librecord liblipsevent libim sqlite3"
diff --git a/packages/gpephone/libabenabler_svn.bb b/packages/gpephone/libabenabler_svn.bb
new file mode 100644
index 0000000000..f362c853d6
--- /dev/null
+++ b/packages/gpephone/libabenabler_svn.bb
@@ -0,0 +1,21 @@
+LICENSE     = "LGPL"
+DESCRIPTION = "LiPS address book library."
+SECTION = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "glib-2.0 librecord liblipsevent libim sqlite3"
+PR          = "r0"
+PV = "0.1+svn-${SRCDATE}"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = "${WORKDIR}/${PN}"
+
+LDFLAGS += " -L${STAGING_LIBDIR}"
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/gpephone/libcalenabler_1.0.bb b/packages/gpephone/libcalenabler_1.0.bb
index f4be78092e..c23e1b42a5 100644
--- a/packages/gpephone/libcalenabler_1.0.bb
+++ b/packages/gpephone/libcalenabler_1.0.bb
@@ -1,5 +1,5 @@
 LICENSE     = "LiPS"
-DESCRIPTION = "LiPS event model library."
+DESCRIPTION = "LiPS calendar database backend library."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 e2fsprogs-libs sqlite3"
diff --git a/packages/gpephone/libgemwidget/.mtn2git_empty b/packages/gpephone/libgemwidget/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpephone/libgemwidget/.mtn2git_empty
diff --git a/packages/gpephone/libgemwidget/gemfilechooser-NULL-callback.patch b/packages/gpephone/libgemwidget/gemfilechooser-NULL-callback.patch
new file mode 100644
index 0000000000..8b5b372ff6
--- /dev/null
+++ b/packages/gpephone/libgemwidget/gemfilechooser-NULL-callback.patch
@@ -0,0 +1,12 @@
+--- /tmp/gemfilechooser.c	2007-05-08 10:05:21.000000000 +0200
++++ libgemwidget-0.1/src/gemfilechooser.c	2007-05-08 10:13:59.015251000 +0200
+@@ -640,7 +640,8 @@
+ 	folder = gtk_file_system_get_folder(filechooser->file_system,
+ 																			path,
+ 																			GTK_FILE_INFO_ALL,
+-																			&error);
++																			NULL,
++                                      &error);
+ 	if (folder == NULL)
+ 	{
+ 		g_print("%s(): get folder error: %s\n",
diff --git a/packages/gpephone/libgemwidget_0.1.bb b/packages/gpephone/libgemwidget_0.1.bb
index 40264b9bb2..0b670e485d 100644
--- a/packages/gpephone/libgemwidget_0.1.bb
+++ b/packages/gpephone/libgemwidget_0.1.bb
@@ -2,12 +2,16 @@ LICENSE     = "LiPS"
 DESCRIPTION = "Extended widget library for GPE phone environment."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
-DEPENDS     = "gtk+ libiac"
+DEPENDS     = "gtk+ libiac libgpephone"
 PR          = "r1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 inherit gpephone pkgconfig autotools
 
+# This really is not angstrom specific, but gtk 2.10 specific
+# for a better solution: "patches accepted"
+SRC_URI_append_angstrom = " file://gemfilechooser-NULL-callback.patch;patch=1"
+
 do_stage () {
 	autotools_stage_all
 }
diff --git a/packages/gpephone/libgpephone_0.4.bb b/packages/gpephone/libgpephone_0.4.bb
new file mode 100644
index 0000000000..690b3eded6
--- /dev/null
+++ b/packages/gpephone/libgpephone_0.4.bb
@@ -0,0 +1,13 @@
+LICENSE     = "LGPL"
+DESCRIPTION = "Base library for GPE phone environment."
+SECTION = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "gtk+ gtk-doc dbus-glib"
+PR          = "r0"
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpephone pkgconfig autotools
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/gpephone/libim_0.2.bb b/packages/gpephone/libim_0.2.bb
index 4d59957d79..a802aface5 100644
--- a/packages/gpephone/libim_0.2.bb
+++ b/packages/gpephone/libim_0.2.bb
@@ -1,5 +1,5 @@
 LICENSE     = "LGPL"
-DESCRIPTION = "LiPS event model library."
+DESCRIPTION = "LiPS instant messenger library."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 libgpg-error libgcrypt gnutls libidn iksemel gloox dbus-glib liblipsevent"
diff --git a/packages/gpephone/libmsgenabler_1.0.bb b/packages/gpephone/libmsgenabler_1.0.bb
index 385501c959..0522507db0 100644
--- a/packages/gpephone/libmsgenabler_1.0.bb
+++ b/packages/gpephone/libmsgenabler_1.0.bb
@@ -1,5 +1,5 @@
 LICENSE     = "LiPS"
-DESCRIPTION = "LiPS event model library."
+DESCRIPTION = "LiPS message backend library."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 dbus-glib librecord sqlite3"
diff --git a/packages/gpephone/librecord2_0.1.bb b/packages/gpephone/librecord2_0.1.bb
new file mode 100644
index 0000000000..532cc267ff
--- /dev/null
+++ b/packages/gpephone/librecord2_0.1.bb
@@ -0,0 +1,15 @@
+LICENSE     = "LiPS"
+DESCRIPTION = "LiPS database API."
+SECTION = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "glib-2.0 e2fsprogs-libs sqlite3"
+PR          = "r0"
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpephone pkgconfig autotools
+
+LDFLAGS += " -L${STAGING_LIBDIR}"
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/gpephone/librecord2_svn.bb b/packages/gpephone/librecord2_svn.bb
new file mode 100644
index 0000000000..6580f6566f
--- /dev/null
+++ b/packages/gpephone/librecord2_svn.bb
@@ -0,0 +1,27 @@
+LICENSE     = "LiPS"
+DESCRIPTION = "LiPS database API."
+SECTION = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "glib-2.0 e2fsprogs-libs sqlite3"
+PR          = "r0"
+PV = "0.1+svn-${SRCDATE}"
+
+DEFAULT_PREFERENCE = "-1"
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = "${WORKDIR}/${PN}"
+
+FILES_${PN} += " ${libdir}/*.so.*"
+FILES_${PN}-dbg += "${libdir}/.debug/*.so.*"
+FILES_${PN}-dev += "${includedir} ${libdir}/*.la ${libdir}/*.so"
+
+
+LDFLAGS += " -L${STAGING_LIBDIR}"
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/gpephone/libsettings_svn.bb b/packages/gpephone/libsettings_svn.bb
new file mode 100644
index 0000000000..e436849d74
--- /dev/null
+++ b/packages/gpephone/libsettings_svn.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "G(PE)^2 settings API library"
+SECTION = "gpe/libs"
+PRIORITY = "required"
+LICENSE = "LiPS"
+DEPENDS = "glib-2.0 gconf-dbus"
+PV = "0.0+svn-${SRCDATE}"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = "${WORKDIR}/${PN}"
+
+FILES_${PN} += " ${libdir}/*.so.*"
+FILES_${PN}-dbg += "${libdir}/.debug/*.so.*"
+FILES_${PN}-dev += "${includedir} ${libdir}/*.la ${libdir}/*.so"
+
+do_stage () {
+    autotools_stage_all
+}
diff --git a/packages/gpephone/libvocenabler_0.1.bb b/packages/gpephone/libvocenabler_0.1.bb
index 0b2d23747c..1dfa5068d0 100644
--- a/packages/gpephone/libvocenabler_0.1.bb
+++ b/packages/gpephone/libvocenabler_0.1.bb
@@ -9,6 +9,12 @@ GPE_TARBALL_SUFFIX = "gz"
 
 inherit gpephone pkgconfig autotools
 
+do_compile_prepend() {
+	for i in `find . -name "Makefile"` ; do
+		sed -i -e s:I/usr/include:I${STAGING_INCDIR}:g $i
+	done	
+}
+
 do_stage () {
 	autotools_stage_all
 }
diff --git a/packages/gpephone/linphone_1.5.0.bb b/packages/gpephone/linphone_1.5.0.bb
index bef090e22a..92e08e6183 100644
--- a/packages/gpephone/linphone_1.5.0.bb
+++ b/packages/gpephone/linphone_1.5.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "SIP-based IP phone"
 HOMEPAGE = "http://www.linphone.org/?lang=us"
 LICENSE = "GPLv2"
 DEPENDS = "libosip2 speex libogg alsa-lib readline"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/1.5.x/source/linphone-${PV}.tar.gz \
            file://linphone-1.5.0.patch;patch=1 \
@@ -26,7 +26,7 @@ do_configure () {
 }
 
 do_compile () {
-	oe_runmake "LIBTOOL=${STAGING_BINDIR_NATIVE}/${TARGET_PREFIX}libtool" LIBTOOL="${STAGING_BINDIR_NATIVE}/${TARGET_PREFIX}libtool"
+	oe_runmake LIBTOOL="${STAGING_BINDIR_NATIVE}/${TARGET_PREFIX}libtool" SPEEX_LIBS="-lspeex" SPEEX_CFLAGS=" "
 }
 
 do_install () {
@@ -41,7 +41,7 @@ do_install_append() {
 do_stage() {
 	export LIBTOOL="${STAGING_BINDIR_NATIVE}/${TARGET_PREFIX}libtool"
 	autotools_stage_all
-	cp ${S}/mediastreamer2/src/libquickstream.la ${STAGING_LIBDIR}
-	cp ${S}/mediastreamer2/src/libmediastreamer.la ${STAGING_LIBDIR}
-	cp ${S}/coreapi/liblinphone.la ${STAGING_LIBDIR}
+	rm ${STAGING_LIBDIR}/libquickstream.la	
+	rm ${STAGING_LIBDIR}/libmediastreamer.la 
+	rm ${STAGING_LIBDIR}/liblinphone.la 
 }
diff --git a/packages/gpephone/machined_svn.bb b/packages/gpephone/machined_svn.bb
new file mode 100644
index 0000000000..5c96cfa97c
--- /dev/null
+++ b/packages/gpephone/machined_svn.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Device abstraction and support daemon"
+SECTION = "gpephone"
+PRIORITY = "required"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 dbus-glib gtk+"
+PV = "0.1+svn-${SRCDATE}"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/;module=${PN}"
+
+S = "${WORKDIR}/${PN}"
diff --git a/packages/gpephone/phoneserver/phoneserver-gta01.patch b/packages/gpephone/phoneserver/phoneserver-gta01.patch
new file mode 100644
index 0000000000..fc5968ef5a
--- /dev/null
+++ b/packages/gpephone/phoneserver/phoneserver-gta01.patch
@@ -0,0 +1,391 @@
+diff -u -r phoneserver-1.0/config.h phoneserver-1.0-mine/config.h
+--- phoneserver-1.0/config.h	2007-02-02 13:20:13.000000000 +0100
++++ phoneserver-1.0-mine/config.h	2007-07-10 15:06:28.000000000 +0200
+@@ -21,8 +21,7 @@
+ 
+ /* serial port name */
+ #ifndef SERIAL_PORT
+-//#define SERIAL_PORT "/dev/pts/0"        //ttyS1"
+-#define SERIAL_PORT "/dev/ttyS1"        //ttyS1"
++#define SERIAL_PORT "/dev/ttySAC0"        /* NEO1973 */
+ #endif                          /*  */
+ 
+ /* serial port baudrate */
+@@ -30,6 +29,8 @@
+ #define SERIAL_BAUDRATE B115200
+ #endif                          /*  */
+ 
++#define CRTSCTS 1	/* NEO needs RTS/CTS flow control */
++
+ /* buffer to hold AT command response */
+ #ifndef ATCOMMAND_BUFFER_SIZE
+ #define ATCOMMAND_BUFFER_SIZE 10240
+diff -u -r phoneserver-1.0/Makefile.am phoneserver-1.0-mine/Makefile.am
+--- phoneserver-1.0/Makefile.am	2007-02-02 13:20:13.000000000 +0100
++++ phoneserver-1.0-mine/Makefile.am	2007-07-10 13:14:47.000000000 +0200
+@@ -3,7 +3,7 @@
+ 
+ INCLUDES = @DEPS_CFLAGS@ -DPREFIX=\"@prefix@\" -D_GNU_SOURCE -Wall \
+            -DDBUS_API_SUBJECT_TO_CHANGE \
+-           -DDEBUG -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API -DCELLON_PLATFORM 
++           -DDEBUG -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API -DT39_PLATFORM -DNEO1973 
+ LDADD = @DEPS_LIBS@
+ 
+ 
+diff -u -r phoneserver-1.0/Makefile.in phoneserver-1.0-mine/Makefile.in
+--- phoneserver-1.0/Makefile.in	2007-02-02 13:25:43.000000000 +0100
++++ phoneserver-1.0-mine/Makefile.in	2007-07-10 13:07:16.000000000 +0200
+@@ -158,7 +158,7 @@
+ target_alias = @target_alias@
+ INCLUDES = @DEPS_CFLAGS@ -DPREFIX=\"@prefix@\" -D_GNU_SOURCE -Wall \
+            -DDBUS_API_SUBJECT_TO_CHANGE \
+-           -DDEBUG -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API -DCELLON_PLATFORM 
++           -DDEBUG -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API -DT39_PLATFORM 
+ 
+ LDADD = @DEPS_LIBS@
+ phoneserver_SOURCES = phoneserver.c phone-server-voc.c phone-server-sms.c phone-server-mul.c phone-server-pbk.c \
+diff -u -r phoneserver-1.0/phoneserver.c phoneserver-1.0-mine/phoneserver.c
+--- phoneserver-1.0/phoneserver.c	2007-02-02 13:20:13.000000000 +0100
++++ phoneserver-1.0-mine/phoneserver.c	2007-07-10 13:43:57.000000000 +0200
+@@ -324,22 +324,31 @@
+                             phonebook_update_entry_handler);
+ #endif
+ 
++#ifdef NEO1973
++  system("echo 1 > /sys/devices/platform/gta01-pm-gsm.0/power_on");
++  sleep(1);
++#endif
++
+   // tapi begins
+   // Initialize
+   result = tapi_initialize ();
+ 
+   // Get file descripter
+-  if (result == TEL_ERR_NONE)
+-  {
++  if (result == TEL_ERR_NONE) {
+     result = tel_get_fd (sid, (UInt32 *) & g_fd);
++  } else {
++    /* without modem there is nothing we can do */
++    exit(1);
+   }
++
+   // Open session
+-  if (result == TEL_ERR_NONE)
+-  {
++  if (result == TEL_ERR_NONE) {
+     result = tel_open_session (&sid);
++  } else {
++    /* without fd we are as well useless */
++    exit(1);
+   }
+ 
+-
+   if (result == TEL_ERR_NONE)
+   {
+     /* pbk section */
+@@ -357,6 +366,9 @@
+     tel_evt_register (sid, TEL_EVENT_MTSMS, sms_incoming_cb, NULL);
+     tel_evt_register (sid, TEL_EVENT_STATUS_REPORT, sta_report_cb, NULL);
+ 
++  } else {
++    /* without session we are also lost */
++    exit(1);
+   }
+   // tapi ends
+ #if 1
+diff -u -r phoneserver-1.0/phone-server-voc.c phoneserver-1.0-mine/phone-server-voc.c
+--- phoneserver-1.0/phone-server-voc.c	2007-02-02 13:20:13.000000000 +0100
++++ phoneserver-1.0-mine/phone-server-voc.c	2007-07-10 16:38:12.000000000 +0200
+@@ -1028,6 +1028,7 @@
+     g_print ("$$$$$$$$$$$$$$$$$$$notify VOC about the %s, and call_id = %d\n",
+              pmethod, call_id);
+ 
++#if 0
+     //0803
+ 
+     guint index;
+@@ -1038,7 +1039,7 @@
+       ("###The held call which is going to be hungup is equal to: %d, index=%d,cid=%d",
+        call_id, index, cid_dbus);
+     //0803
+-
++#endif
+ 
+     if (!strcmp (pmethod, "accept"))
+     {
+diff -u -r phoneserver-1.0/serial.c phoneserver-1.0-mine/serial.c
+--- phoneserver-1.0/serial.c	2007-02-02 13:20:13.000000000 +0100
++++ phoneserver-1.0-mine/serial.c	2007-07-10 15:07:14.000000000 +0200
+@@ -124,7 +124,7 @@
+ 
+ 
+ /* Open a device with standard options.
+- *Use value (-1) for "with_hw_handshake" if its specification is required from the user.
++ * Use value (-1) for "with_hw_handshake" if its specification is required from the user.
+  */
+ int
+ serial_opendevice (const Int8 *file, Int32 with_odd_parity, Int32 with_async)
+@@ -148,8 +148,7 @@
+ 
+   /* Set port settings for canonical input processing */
+   tp.c_cflag = B0 | CS8 | CLOCAL | CREAD | HUPCL;
+-  if (with_odd_parity)
+-  {
++  if (with_odd_parity) {
+     tp.c_cflag |= (PARENB | PARODD);
+     tp.c_iflag = 0;
+   }
+@@ -157,35 +156,36 @@
+     tp.c_iflag = IGNPAR;
+ 
+ #ifdef CRTSCTS
++  tp.c_cflag |= CRTSCTS;
++#else
+   tp.c_cflag &= ~CRTSCTS;
+-
+-#endif /*  */
++#endif
+   tp.c_oflag = 0;
+   tp.c_lflag = 0;
+   tp.c_cc[VMIN] = 1;
+   tp.c_cc[VTIME] = 0;
++
+   retcode = tcflush (fd, TCIFLUSH);
+-  if (retcode == -1)
+-  {
++  if (retcode == -1) {
+     perror ("Gnokii serial_opendevice: tcflush");
+     serial_close (fd);
+     return -1;
+   }
++
+   retcode = tcsetattr (fd, TCSANOW, &tp);
+-  if (retcode == -1)
+-  {
++  if (retcode == -1) {
+     perror ("Gnokii serial_opendevice: tcsetattr");
+     serial_close (fd);
+     return -1;
+   }
++
+   serial_changespeed (fd, 115200);
+ 
+   /* We need to turn off O_NONBLOCK now (we have CLOCAL set so it is safe).
+    *When we run some device script it really doesn't expect NONBLOCK!
+    */
+   retcode = fcntl (fd, F_SETFL, 0);
+-  if (retcode == -1)
+-  {
++  if (retcode == -1) {
+     perror ("Gnokii serial_opendevice: fnctl(F_SETFL)");
+     serial_close (fd);
+     return -1;
+@@ -195,8 +195,7 @@
+ 
+ #if !(__unices__)
+   retcode = fcntl (fd, F_SETOWN, getpid ());
+-  if (retcode == -1)
+-  {
++  if (retcode == -1) {
+     perror ("Gnokii serial_opendevice: fnctl(F_SETOWN)");
+     serial_close (fd);
+     return -1;
+@@ -223,12 +222,12 @@
+ 
+ #  endif
+ #endif /*  */
+-  if (retcode == -1)
+-  {
++  if (retcode == -1) {
+     perror ("Gnokii serial_opendevice: fnctl(F_SETFL)");
+     serial_close (fd);
+     return -1;
+   }
++
+   return fd;
+ }
+ 
+@@ -240,15 +239,16 @@
+   unsigned int flags;
+ 
+   flags = TIOCM_DTR;
++
+   if (dtr)
+     ioctl (fd, TIOCMBIS, &flags);
+-
+   else
+     ioctl (fd, TIOCMBIC, &flags);
++
+   flags = TIOCM_RTS;
++
+   if (rts)
+     ioctl (fd, TIOCMBIS, &flags);
+-
+   else
+     ioctl (fd, TIOCMBIC, &flags);
+ }
+@@ -262,6 +262,7 @@
+   FD_SET (fd, &readfds);
+   return select (fd + 1, &readfds, NULL, NULL, timeout);
+ }
++
+ static int
+ serial_wselect (int fd, struct timeval *timeout)
+ {
+@@ -361,12 +362,9 @@
+   {
+     bs = n;
+     got = write (fd, buf + r, bs);
+-    if (got == 0)
+-    {
+-      g_print ("Serial write: oops, zero byte has written!\n");
+-    }
+-    else if (got < 0)
+-    {
++    if (got == 0) {
++      g_print ("Serial write: oops, zero byte written!\n");
++    } else if (got < 0) {
+       if (errno == EINTR)
+         continue;
+       if (errno != EAGAIN)
+diff -u -r phoneserver-1.0/tapi.c phoneserver-1.0-mine/tapi.c
+--- phoneserver-1.0/tapi.c	2007-02-02 13:20:13.000000000 +0100
++++ phoneserver-1.0-mine/tapi.c	2007-07-10 16:51:22.000000000 +0200
+@@ -112,6 +112,7 @@
+ /************************************************************************/
+ /* Initialization Function Block                                        */
+ /************************************************************************/
++tel_err_t tapi_Init_PowerOn ();
+ tel_err_t tapi_Init_SoftReset ();
+ tel_err_t tapi_Init_SetNoEcho ();
+ tel_err_t tapi_Init_SetCharset ();
+@@ -287,6 +288,7 @@
+   
+  ****************/
+ static init_function init_func_table[] = {
++  tapi_Init_PowerOn,
+   tapi_Init_SoftReset,
+   tapi_Init_SetNoEcho,
+   tapi_Init_SetCharset,
+@@ -477,6 +479,18 @@
+ 
+ 
+ tel_err_t
++tapi_Init_PowerOn ()
++{
++  tel_err_t result;
++  Int8 *CommandStr;
++
++  /* AT+CFUN=1 */
++  CommandStr = AT_Builder_ExeCmd ((Int8 *) CMD_CFUN, (Int8 *) "=1", (Int8 *) NULL);
++  result = tapi_init_general (CommandStr);
++  return result;
++}
++
++tel_err_t
+ tapi_Init_SoftReset ()
+ {
+   tel_err_t result;
+@@ -516,7 +530,7 @@
+   //TODO: This phone does not support "HEX", we should set it to HEX
+ #ifdef T39_PLATFORM
+   CommandStr =
+-    AT_Builder_SetCmd ((Int8 *) CMD_CSCS, (Int8 *) "\"UTF-8\"", (Int8 *) NULL);
++    AT_Builder_SetCmd ((Int8 *) CMD_CSCS, (Int8 *) "\"8859-1\"", (Int8 *) NULL);
+ #endif
+ #ifdef CELLON_PLATFORM
+   CommandStr =
+@@ -689,8 +703,8 @@
+                        (Int8 *) "0", (Int8 *) "1", (Int8 *) "0", (Int8 *) NULL);
+ #else
+   CommandStr =
+-    AT_Builder_SetCmd ((Int8 *) CMD_CNMI, (Int8 *) "3", (Int8 *) "1",
+-                       (Int8 *) "0", (Int8 *) "0", (Int8 *) "0", (Int8 *) NULL);
++    AT_Builder_SetCmd ((Int8 *) CMD_CNMI, (Int8 *) "2", (Int8 *) "1",
++                       (Int8 *) "0", (Int8 *) "1", (Int8 *) "0", (Int8 *) NULL);
+ #endif
+   result = tapi_init_general (CommandStr);
+   return result;
+@@ -1737,7 +1751,7 @@
+   (*evt)->evt_data.async_data.cb = tel_ctx.cur_async_evt.cb;
+   (*evt)->evt_data.async_data.user_data = tel_ctx.cur_async_evt.user_data;
+ #ifdef DEBUG
+-  //g_print("sms data is --> %s\n", data->user_data[0].text);
++  g_print("sms data is --> %s\n", data->user_data[0].text);
+ #endif
+   return TEL_ERR_NONE;
+ }
+@@ -1979,14 +1993,14 @@
+     sscanf (param_str, "%d", &index);
+     entry->index = index;
+ #ifdef DEBUG
+-    //g_print("index -> %d\n", index);
++    g_print("index -> %d\n", index);
+ #endif
+     /* number */
+     param_str = (Int8 *) g_ptr_array_index (param, 1);
+     //exclude the quotation
+     memcpy (entry->number.number, param_str + 1, strlen (param_str) - 2);
+ #ifdef DEBUG
+-    //g_print("number -> %s\n", entry->number.number);
++    g_print("number -> %s\n", entry->number.number);
+ #endif
+     /* type */
+     param_str = (Int8 *) g_ptr_array_index (param, 2);
+@@ -1994,7 +2008,7 @@
+     entry->number.npi = index & 0xF;
+     entry->number.ton = (index & 0x70) >> 4;
+ #ifdef DEBUG
+-    //g_print("type -> %s\n", param_str);
++    g_print("type -> %s\n", param_str);
+ #endif
+     /* text */
+     param_str = (Int8 *) g_ptr_array_index (param, 3);
+@@ -2015,7 +2029,7 @@
+     char_unicode_decode (entry->text, entry_textbuffer, len);
+ #endif
+ #ifdef DEBUG
+-    //g_print("text -> %s\n", entry->text);
++    g_print("text -> %s\n", entry->text);
+ #endif
+     AT_Parser_Free (param);
+     /* add the entry into array */
+@@ -2524,11 +2538,11 @@
+   tel_call_info_change_t *call_status = g_new0 (tel_call_info_change_t, 1);
+   at_command_buffer_t *cmd_buffer;
+ 
+-  //g_print("AT_UNSO_PPURC_Handler called\n");
+-//              cmd_buffer = tapi_get_cmd_buffer(in_buffer, CMD_PPURC, 0, NULL);
++  g_print("AT_UNSO_PPURC_Handler called\n");
++              cmd_buffer = tapi_get_cmd_buffer(in_buffer, CMD_PPURC, 0, NULL);
+ #ifdef DEBUG
+-  //g_print("====cur parser pos is ---> %d\n", tel_ctx.cur_parser_pos);
+-  //g_print("====total parser item is ---> %d\n", tel_ctx.cur_resp.cmd->len);
++  g_print("====cur parser pos is ---> %d\n", tel_ctx.cur_parser_pos);
++  g_print("====total parser item is ---> %d\n", tel_ctx.cur_resp.cmd->len);
+ #endif
+   cmd_buffer =
+     tapi_get_cmd_buffer (in_buffer, CMD_PPURC, tel_ctx.cur_parser_pos - 1,
+@@ -3749,8 +3763,10 @@
+       break;
+     case TEL_HANGUPALL:
+       /* +CHUP */
++      //CommandStr =
++      //  AT_Builder_ExeCmd ((Int8 *) CMD_CHUP, (Int8 *) NULL, (Int8 *) NULL);
+       CommandStr =
+-        AT_Builder_ExeCmd ((Int8 *) CMD_CHUP, (Int8 *) NULL, (Int8 *) NULL);
++        AT_Builder_ExeCmd ((Int8 *) "H", (Int8 *) NULL, (Int8 *) NULL);
+       break;
+     case TEL_HANGUPACTIVE_ACCEPTOTHER:
+       /* +CHLD=1 */
+@@ -3859,7 +3875,8 @@
+         break;
+       case TEL_HANGUPALL:
+         /* +CHUP */
+-        AT_Builder_AppendCmd ((Int8 *) CMD_CHUP, (Int8 *) NULL, (Int8 *) NULL);
++        //AT_Builder_AppendCmd ((Int8 *) CMD_CHUP, (Int8 *) NULL, (Int8 *) NULL);
++        AT_Builder_AppendCmd ((Int8 *) "H", (Int8 *) NULL, (Int8 *) NULL);
+         break;
+       case TEL_HANGUPACTIVE_ACCEPTOTHER:
+         /* +CHLD=1 */
diff --git a/packages/gpephone/phoneserver_1.0.bb b/packages/gpephone/phoneserver_1.0.bb
index 522d31cee1..1415951473 100644
--- a/packages/gpephone/phoneserver_1.0.bb
+++ b/packages/gpephone/phoneserver_1.0.bb
@@ -2,12 +2,15 @@ LICENSE     = "LiPS"
 DESCRIPTION = "Phone services server"
 SECTION = "gpe"
 PRIORITY    = "optional"
-PR          = "r1"
+PR          = "r3"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEPENDS = "dbus-glib glib-2.0  libmsgenabler libabenabler"
 
 GPE_TARBALL_SUFFIX= "bz2"
 inherit gpephone autotools
 
-SRC_URI += "file://changeport.patch;patch=1;pnum=0"
+SRC_URI_append_x86 = " file://changeport.patch;patch=1;pnum=0"
+SRC_URI_append_fic-gta01 = " file://phoneserver-gta01.patch;patch=1"
 
diff --git a/packages/gpephone/ptim-engine/.mtn2git_empty b/packages/gpephone/ptim-engine/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpephone/ptim-engine/.mtn2git_empty
diff --git a/packages/gpephone/ptim-engine/gtkmodule-location.patch b/packages/gpephone/ptim-engine/gtkmodule-location.patch
new file mode 100644
index 0000000000..6882f1239d
--- /dev/null
+++ b/packages/gpephone/ptim-engine/gtkmodule-location.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.am~	2007-04-05 16:49:43.000000000 +0200
++++ src/Makefile.am	2007-04-05 16:49:43.000000000 +0200
+@@ -3,7 +3,7 @@
+ GTK_PREFIX=`pkg-config gtk+-2.0 --variable=libdir`

+ GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version`

+ 

+-moduledir = $(GTK_PREFIX)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/engine

++moduledir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/engine

+ 

+ INCLUDES		= -DPACKAGE_LOCALE_DIR=\"@datadir@/locale/@PACKAGE_NAME@\" -DSN_API_NOT_YET_FROZEN \

+ 							-I. $(IMENGINE_CFLAGS)

diff --git a/packages/gpephone/ptim-engine_svn.bb b/packages/gpephone/ptim-engine_svn.bb
new file mode 100644
index 0000000000..a2a38a0e2e
--- /dev/null
+++ b/packages/gpephone/ptim-engine_svn.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Phone input method engine"
+SECTION = "gpephone"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "gtk+ ptim-headers"
+PV = "0.1+svn-${SRCDATE}"
+PR = "r1"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imengine"
+
+S = "${WORKDIR}/imengine"
+
+FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/engine/*.so "
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/ptim/engine/.debug/*.so"
+FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/ptim/engine/*.la"
+
+do_stage () {
+    autotools_stage_all
+}
\ No newline at end of file
diff --git a/packages/gpephone/ptim-headers_svn.bb b/packages/gpephone/ptim-headers_svn.bb
new file mode 100644
index 0000000000..304c103505
--- /dev/null
+++ b/packages/gpephone/ptim-headers_svn.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Phone input method - shared headers"
+SECTION = "gpephone"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "gtk+"
+PV = "0.1+svn-${SRCDATE}"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imheaders"
+
+S = "${WORKDIR}/imheaders"
+
+DEFAULT_PREFERENCE = "-1"
+
+do_stage () {
+    autotools_stage_all
+}
\ No newline at end of file
diff --git a/packages/gpephone/ptim-helper/.mtn2git_empty b/packages/gpephone/ptim-helper/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpephone/ptim-helper/.mtn2git_empty
diff --git a/packages/gpephone/ptim-helper/gtkmodule-location.patch b/packages/gpephone/ptim-helper/gtkmodule-location.patch
new file mode 100644
index 0000000000..cd0e469608
--- /dev/null
+++ b/packages/gpephone/ptim-helper/gtkmodule-location.patch
@@ -0,0 +1,22 @@
+--- src/Makefile.am~	2007-04-05 16:40:45.000000000 +0200
++++ src/Makefile.am	2007-04-05 16:40:45.000000000 +0200
+@@ -3,7 +3,7 @@
+ GTK_PREFIX=`pkg-config gtk+-2.0 --variable=libdir`

+ GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version`

+ 

+-moduledir = $(GTK_PREFIX)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/helper

++moduledir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/helper

+ 

+ INCLUDES		= -DPACKAGE_LOCALE_DIR=\"@datadir@/locale/@PACKAGE_NAME@\" -DSN_API_NOT_YET_FROZEN \

+ 							-I. $(IMHELPER_CFLAGS)

+--- pixmaps/Makefile.am~	2007-04-05 16:43:16.000000000 +0200
++++ pixmaps/Makefile.am	2007-04-05 16:43:16.000000000 +0200
+@@ -1,7 +1,7 @@
+ GTK_PREFIX=`pkg-config gtk+-2.0 --variable=libdir`
+ GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version`
+ 
+-pixmapsdir		= $(GTK_PREFIX)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/pixmaps
++pixmapsdir		= $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/pixmaps
+ pixmaps_DATA	= \
+ 	next.png \
+ 	prev.png \
diff --git a/packages/gpephone/ptim-helper_svn.bb b/packages/gpephone/ptim-helper_svn.bb
new file mode 100644
index 0000000000..3461de6225
--- /dev/null
+++ b/packages/gpephone/ptim-helper_svn.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Phone input method helper module"
+SECTION = "gpephone"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "gtk+ ptim-headers"
+PV = "0.1+svn-${SRCDATE}"
+PR = "r1"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imhelper"
+
+S = "${WORKDIR}/imhelper"
+
+FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/helper/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pixmaps/*"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/ptim/helper/.debug/*.so"
+FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/ptim/helper/*.la"
+
+do_stage () {
+    autotools_stage_all
+}
\ No newline at end of file
diff --git a/packages/gpephone/ptim-manager/.mtn2git_empty b/packages/gpephone/ptim-manager/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpephone/ptim-manager/.mtn2git_empty
diff --git a/packages/gpephone/ptim-manager/gtkmodule-location.patch b/packages/gpephone/ptim-manager/gtkmodule-location.patch
new file mode 100644
index 0000000000..d02166e1ac
--- /dev/null
+++ b/packages/gpephone/ptim-manager/gtkmodule-location.patch
@@ -0,0 +1,21 @@
+--- src/Makefile.am~	2007-04-05 16:01:29.000000000 +0200
++++ src/Makefile.am	2007-04-05 16:01:29.000000000 +0200
+@@ -3,7 +3,7 @@
+ GTK_PREFIX=`pkg-config gtk+-2.0 --variable=libdir`

+ GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version`

+ 

+-moduledir = $(GTK_PREFIX)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules

++moduledir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules

+ 

+ INCLUDES		= -DPACKAGE_LOCALE_DIR=\"@datadir@/locale/@PACKAGE_NAME@\" -DSN_API_NOT_YET_FROZEN \

+ 							-I. $(IMMANAGER_CFLAGS)

+--- Makefile.am~	2007-04-05 16:21:36.000000000 +0200
++++ Makefile.am	2007-04-05 16:21:36.000000000 +0200
+@@ -3,6 +3,6 @@
+ GTK_PREFIX=`pkg-config gtk+-2.0 --variable=libdir`
+ GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version`
+ 
+-confdir		= $(GTK_PREFIX)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/
++confdir		= $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/
+ conf_DATA	= \
+ 	conf/imconfig
diff --git a/packages/gpephone/ptim-manager_svn.bb b/packages/gpephone/ptim-manager_svn.bb
new file mode 100644
index 0000000000..5c8042c5d5
--- /dev/null
+++ b/packages/gpephone/ptim-manager_svn.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Phone input method manager module"
+SECTION = "gpephone"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "gtk+ ptim-headers libiac"
+PV = "0.1+svn-${SRCDATE}"
+PR = "r2"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=immanager"
+
+S = "${WORKDIR}/immanager"
+
+FILES_${PN} += "${libdir}/gtk-2.0/*/immodules/*.so ${libdir}/gtk-2.0/*/immodules/ptim"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/.debug/*.so"
+FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/*.la"
+
+
+do_install_append () {
+	# That's evil... 
+	install -m 644 ${S}/conf/imconfig ${D}/${libdir}/gtk-2.0/*/immodules/ptim
+}
+
+
+
+do_stage () {
+    autotools_stage_all
+}
\ No newline at end of file
diff --git a/packages/gpephone/xoo-vm_0.7-20070204.bb b/packages/gpephone/xoo-vm_0.7-20070204.bb
index b927269db2..0bdda47359 100644
--- a/packages/gpephone/xoo-vm_0.7-20070204.bb
+++ b/packages/gpephone/xoo-vm_0.7-20070204.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 DEPENDS = "virtual/libx11 libxtst gtk+ libglade"
 SRCDATE = 20070204
 PV = "0.7+svn${SRCDATE}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=Xoo;proto=http \
            file://gpephone-vm.patch;patch=1;pnum=0"
@@ -14,3 +14,5 @@ SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=Xoo;proto=http \
 S = "${WORKDIR}/Xoo"
 
 inherit autotools
+
+FILES_${PN} += "${datadir}/xoo"