7 files changed, 47 insertions, 3 deletions
diff --git a/packages/gpephone/gpe-session-scripts-phone/phonesession b/packages/gpephone/gpe-session-scripts-phone/phonesession
index 2dacc4c4c9..ee187e2fb0 100755
--- a/packages/gpephone/gpe-session-scripts-phone/phonesession
+++ b/packages/gpephone/gpe-session-scripts-phone/phonesession
@@ -24,7 +24,6 @@ export	SMS_GRAPHIC_PATH=$APP_PATH/share/graphic
 export	SMS_RING_TONE_PATH=$APP_PATH/share/chocolate.mp3
 
 # For E-mail
-export	EMAIL_GRAPHIC_PATH=$APP_PATH/share/email-graphic
 export	TINYMAIL_CACHE_DIR=$APP_PATH/share/tinymail.cache
 
 # For Calendar
diff --git a/packages/gpephone/gpe-session-scripts-phone_0.67.bb b/packages/gpephone/gpe-session-scripts-phone_0.67.bb
index 730a549aef..4cedeaa7f8 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 = "r7"
+PR = "r8"
 
 S = "${WORKDIR}/gpe-session-scripts-${PV}"
 
diff --git a/packages/gpephone/libabenabler2_1.0.bb b/packages/gpephone/libabenabler2_1.0.bb
new file mode 100644
index 0000000000..9277d9359a
--- /dev/null
+++ b/packages/gpephone/libabenabler2_1.0.bb
@@ -0,0 +1,15 @@
+LICENSE     = "LiPS"
+DESCRIPTION = "LiPS address book library."
+SECTION = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "glib-2.0 librecord2 gconf 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/ptim-engine_svn.bb b/packages/gpephone/ptim-engine_svn.bb
index a2a38a0e2e..37c99f7dd1 100644
--- a/packages/gpephone/ptim-engine_svn.bb
+++ b/packages/gpephone/ptim-engine_svn.bb
@@ -14,7 +14,7 @@ SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=im
 
 S = "${WORKDIR}/imengine"
 
-FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/engine/*.so "
+FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/engine/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pydatabase/*"
 FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/ptim/engine/.debug/*.so"
 FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/ptim/engine/*.la"
 
diff --git a/packages/gpephone/vochistory_0.1.bb b/packages/gpephone/vochistory_0.1.bb
new file mode 100644
index 0000000000..d72bbcc3cd
--- /dev/null
+++ b/packages/gpephone/vochistory_0.1.bb
@@ -0,0 +1,12 @@
+LICENSE     = "LiPS"
+DESCRIPTION = "Voice call event history"
+SECTION = "gpe"
+PRIORITY    = "optional"
+PR          = "r0"
+
+DEPENDS = "gtk+ dbus-glib libgpewidget libgpephone libiac libchenabler"
+
+inherit gpephone autotools
+
+SRC_URI = "${GPEPHONE_MIRROR}/vochistory-${PV}/callhistory-${PV}.tar.bz2"
+S = "${WORKDIR}/callhistory-${PV}"
+\ No newline at end of file
diff --git a/packages/tasks/task-gpephone.bb b/packages/tasks/task-gpephone.bb
index e0298ae8d7..27cb26174b 100644
--- a/packages/tasks/task-gpephone.bb
+++ b/packages/tasks/task-gpephone.bb
@@ -29,6 +29,7 @@ RDEPENDS_gpephone-task-base = "\
     phoneserver \
     soundserver \
     voicecall \
+    vochistory \
     sms \
     audioplayer \
     videoplayer \
@@ -87,4 +88,5 @@ RDEPENDS_gpephone-task-apps = "\
     gpe-windowlist"
 
 RDEPENDS_gpephone-task-connectivity = "\
+    email \
 "
diff --git a/packages/xserver-common/xserver-common_1.17.bb b/packages/xserver-common/xserver-common_1.17.bb
new file mode 100644
index 0000000000..a30a37c893
--- /dev/null
+++ b/packages/xserver-common/xserver-common_1.17.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
+PR = "r0"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://setDPI.sh "
+
+do_install_append() {
+	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}