summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/openmoko-apps/openmoko-calculator_svn.bb9
-rw-r--r--packages/openmoko-apps/openmoko-terminal/.mtn2git_empty (renamed from packages/openmoko-base/files/.mtn2git_empty)0
-rw-r--r--packages/openmoko-apps/openmoko-terminal/gtkterm2rc85
-rw-r--r--packages/openmoko-apps/openmoko-terminal/openmoko-terminal.desktop12
-rw-r--r--packages/openmoko-apps/openmoko-terminal/openmoko-terminal.pngbin0 -> 11078 bytes
-rw-r--r--packages/openmoko-apps/openmoko-terminal_svn.bb34
-rw-r--r--packages/openmoko-base/openmoko-icon-theme-standard_svn.bb12
-rw-r--r--packages/openmoko-base/openmoko-libs_svn.bb16
-rw-r--r--packages/openmoko-base/openmoko-session/.mtn2git_empty (renamed from packages/openmoko-pim/openmoko-contacts/.mtn2git_empty)0
-rw-r--r--packages/openmoko-base/openmoko-session/session (renamed from packages/openmoko-base/files/session)13
-rw-r--r--packages/openmoko-base/openmoko-session_svn.bb13
-rw-r--r--packages/openmoko-base/openmoko-sound-system/.mtn2git_empty (renamed from packages/openmoko-pim/openmoko-dates/.mtn2git_empty)0
-rwxr-xr-xpackages/openmoko-base/openmoko-sound-system/pulseaudio46
-rw-r--r--packages/openmoko-base/openmoko-sound-system/session26
-rw-r--r--packages/openmoko-base/openmoko-sound-system_0.1.0.bb31
-rw-r--r--packages/openmoko-base/openmoko-sound-theme-standard_svn.bb23
-rw-r--r--packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb6
-rw-r--r--packages/openmoko-pim/files/.mtn2git_empty0
-rw-r--r--packages/openmoko-pim/files/index.theme (renamed from packages/openmoko-pim/openmoko-contacts/index.theme)0
-rw-r--r--packages/openmoko-pim/files/intltool-update.in (renamed from packages/openmoko-pim/openmoko-contacts/intltool-update.in)0
-rw-r--r--packages/openmoko-pim/files/openmoko-dates.desktop12
-rw-r--r--packages/openmoko-pim/files/openmoko-dates.pngbin0 -> 12121 bytes
-rw-r--r--packages/openmoko-pim/files/stock_contact.png (renamed from packages/openmoko-pim/openmoko-contacts/stock_contact.png)bin2311 -> 2311 bytes
-rw-r--r--packages/openmoko-pim/files/stock_person.png (renamed from packages/openmoko-pim/openmoko-contacts/stock_person.png)bin2280 -> 2280 bytes
-rw-r--r--packages/openmoko-pim/openmoko-dates/compile-fix.patch12
-rw-r--r--packages/openmoko-pim/openmoko-dates/intltool-update.in1089
-rw-r--r--packages/openmoko-pim/openmoko-dates/om-dates-temp-buildfix_20070308.patch8
-rw-r--r--packages/openmoko-pim/openmoko-dates/remove-bogus-include.patch10
-rw-r--r--packages/openmoko-pim/openmoko-dates_svn.bb16
-rw-r--r--packages/openmoko-pim/openmoko-tasks_svn.bb15
-rw-r--r--packages/openmoko-pim/openmoko-today_svn.bb2
-rw-r--r--packages/tasks/task-openmoko.bb77
32 files changed, 380 insertions, 1187 deletions
diff --git a/packages/openmoko-apps/openmoko-calculator_svn.bb b/packages/openmoko-apps/openmoko-calculator_svn.bb
new file mode 100644
index 0000000000..19f3ed9e45
--- /dev/null
+++ b/packages/openmoko-apps/openmoko-calculator_svn.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "The OpenMoko Calculator Application"
+SECTION = "openmoko/applications"
+AUTHOR = "Rodolphe Ortalo <rodolphe.ortalo@free.fr>"
+
+PV = "0.0.3+svn${SRCDATE}"
+PR = "r0"
+
+inherit openmoko
+
diff --git a/packages/openmoko-base/files/.mtn2git_empty b/packages/openmoko-apps/openmoko-terminal/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/openmoko-base/files/.mtn2git_empty
+++ b/packages/openmoko-apps/openmoko-terminal/.mtn2git_empty
diff --git a/packages/openmoko-apps/openmoko-terminal/gtkterm2rc b/packages/openmoko-apps/openmoko-terminal/gtkterm2rc
new file mode 100644
index 0000000000..d68f01ab57
--- /dev/null
+++ b/packages/openmoko-apps/openmoko-terminal/gtkterm2rc
@@ -0,0 +1,85 @@
+##
+# 1=RIGHT, 2=TOP, 3=BOTTOM, 4=LEFT
+##
+notebookPanel=3
+
+##
+# 0=HIDDEN, 1=LEFT, 2=RIGHT
+##
+terminalScrollbar=2
+
+##
+# 0=NO SCROLLBAR
+##
+maxScrollbackBuffer=999
+
+##
+# 0=FALSE, 1=TRUE
+##
+quitPRGonExitLastTerminal=1
+
+##
+# 0=FALSE, 1=TRUE
+##
+showTabsByOneTerminal=0
+
+##
+#A Font name: use gnome-font-properties to look at available fonts
+##
+terminalFont=BitStream Vera Sans Mono 11
+
+##
+# Separator for marking with mouse
+##
+worldClass=-A-Za-z0-9/_:.,?+%=
+
+##
+# 0=FALSE, 1=TRUE
+##
+scrollOnKeyStroke=1
+
+##
+# 0=FALSE, 1=TRUE
+##
+scrollOnOutput=0
+
+##
+# 0=FALSE, 1=TRUE
+##
+blink=1
+
+##
+# 0=FALSE, 1=TRUE
+##
+beep=1
+
+##
+# x y Default Terminal Size in pix
+##
+terminalSize=80 25
+
+##
+# NEW COLOR Definition
+##
+red=0x0000 0xcccc 0x0000 0xaaaa 0x0000 0xaaaa 0x6666 0xaaaa 0x0000 0xcccc 0x5555 0xffff 0x5555 0xffff 0x5555 0xffff 0x5555 0xffff
+grn=0x0000 0xcccc 0x0000 0x0000 0xaaaa 0x5555 0x6666 0x0000 0xaaaa 0xcccc 0x5555 0x5555 0xffff 0xffff 0x5555 0x5555 0xffff 0xffff
+blu=0x0000 0xcccc 0x0000 0x0000 0x0000 0x0000 0xffff 0xaaaa 0xaaaa 0xcccc 0x5555 0x5555 0x5555 0x5555 0xffff 0xffff 0xffff 0xffff
+
+##
+# COLOR Definition
+##
+
+##
+# First section
+##
+[section]
+match=
+worldClass=-A-Za-z0-9/_:.,?+%=
+scrollOnKeyStroke=1
+scrollOnOutput=0
+beep=1
+blink=1
+red=0x0000 0xcccc 0x0000 0xaaaa 0x0000 0xaaaa 0x6666 0xaaaa 0x0000 0x0000 0x5555 0xffff 0x5555 0xffff 0x5555 0xffff 0x5555 0xffff
+grn=0x0000 0xcccc 0x0000 0x0000 0xaaaa 0x5555 0x6666 0x0000 0xaaaa 0xcccc 0x5555 0x5555 0xffff 0xffff 0x5555 0x5555 0xffff 0xffff
+blu=0x0000 0xcccc 0x0000 0x0000 0x0000 0x0000 0xffff 0xaaaa 0xaaaa 0x0000 0x5555 0x5555 0x5555 0x5555 0xffff 0xffff 0xffff 0xffff
+
diff --git a/packages/openmoko-apps/openmoko-terminal/openmoko-terminal.desktop b/packages/openmoko-apps/openmoko-terminal/openmoko-terminal.desktop
new file mode 100644
index 0000000000..ced7c0b8e2
--- /dev/null
+++ b/packages/openmoko-apps/openmoko-terminal/openmoko-terminal.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Terminal
+Comment=Command Line Interface Terminal
+Exec=gtkterm2
+Icon=openmoko-terminal
+Terminal=false
+Type=Application
+Categories=GTK;Application;PIM;Office
+MimeType=text/x-vcard;
+SingleInstance=false
+StartupNotify=true
diff --git a/packages/openmoko-apps/openmoko-terminal/openmoko-terminal.png b/packages/openmoko-apps/openmoko-terminal/openmoko-terminal.png
new file mode 100644
index 0000000000..56e8e59628
--- /dev/null
+++ b/packages/openmoko-apps/openmoko-terminal/openmoko-terminal.png
Binary files differ
diff --git a/packages/openmoko-apps/openmoko-terminal_svn.bb b/packages/openmoko-apps/openmoko-terminal_svn.bb
new file mode 100644
index 0000000000..9238bbd1eb
--- /dev/null
+++ b/packages/openmoko-apps/openmoko-terminal_svn.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "The OpenMoko Command Line Console"
+SECTION = "openmoko/applications"
+RDEPENDS += "gtkterm2"
+PV = "1.0.0+svn${SRCDATE}"
+PR = "r1"
+
+inherit openmoko
+
+SRC_URI = "file://openmoko-terminal.png \
+ file://openmoko-terminal.desktop \
+ file://gtkterm2rc"
+
+do_install() {
+ install -d ${D}${sysconfdir}/skel
+ install -d ${D}${datadir}/pixmaps
+ install -d ${D}${datadir}/applications
+ install -m 0644 ${WORKDIR}/openmoko-terminal.png ${D}${datadir}/pixmaps/
+ install -m 0644 ${WORKDIR}/openmoko-terminal.desktop ${D}${datadir}/applications/
+ install -m 0644 ${WORKDIR}/gtkterm2rc ${D}${sysconfdir}/skel/.gtkterm2rc
+}
+
+pkg_postinst_openmoko-terminal() {
+#!/bin/sh -e
+if [ "x$D" != "x" ]; then
+ exit 1 # don't run at image generation time
+else
+ if [ -e "$HOME/.gtkterm2rc" ]; then
+ echo "not overriding $HOME/.gtkterm2rc"
+ else
+ echo "installing $HOME/.gtkterm2rc from /etc/skel"
+ cp -f ${sysconfdir}/skel/.gtkterm2rc $HOME/
+ fi
+fi
+}
diff --git a/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb
index 8be6211d68..a7f62b31c0 100644
--- a/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb
+++ b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb
@@ -1,11 +1,19 @@
DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution"
SECTION = "openmoko/base"
-PV = "0.0+svn${SRCDATE}"
-PR = "r0"
+PV = "0.1+svn${SRCDATE}"
+PR = "r1"
inherit openmoko-base autotools
SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=icons;proto=http"
S = "${WORKDIR}/icons"
+pkg_postinst_openmoko-icon-theme-standard () {
+#!/bin/sh -e
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+gtk-update-icon-cache ${datadir}/icons/openmoko-standard/
+}
+
PACKAGE_ARCH = "all"
diff --git a/packages/openmoko-base/openmoko-libs_svn.bb b/packages/openmoko-base/openmoko-libs_svn.bb
index caa70363a2..a7b5387a99 100644
--- a/packages/openmoko-base/openmoko-libs_svn.bb
+++ b/packages/openmoko-base/openmoko-libs_svn.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "openmoko-libs is a set of libraries implementing a Gtk+ based app
SECTION = "openmoko/libs"
LICENSE = "LGPL"
DEPENDS += "gtk+ eds-dbus libgsmd libxosd"
-PV = "0.0.1+svn${SRCDATE}"
-PR = "r5"
+PV = "0.4+svn${SRCDATE}"
+PR = "r0"
inherit openmoko
@@ -11,12 +11,12 @@ do_stage() {
autotools_stage_all
}
-PACKAGES =+ " \
- libmokojournal libmokojournal-dev libmokojournal-dbg \
- libmokogsmd libmokogsmd-dev libmokogsmd-dbg \
- libmokocore libmokocore-dev libmokocore-dbg \
- libmokoui libmokoui-dev libmokoui-dbg \
- "
+PACKAGES =+ "\
+ libmokojournal libmokojournal-dev libmokojournal-dbg \
+ libmokogsmd libmokogsmd-dev libmokogsmd-dbg \
+ libmokocore libmokocore-dev libmokocore-dbg \
+ libmokoui libmokoui-dev libmokoui-dbg \
+"
FILES_libmokojournal = "${libdir}/libmokojournal.so.*"
FILES_libmokojournal-dev = "${libdir}/libmokojournal.so ${libdir}/libmokojournal.*a ${includedir}/${PN}/libmokojournal"
diff --git a/packages/openmoko-pim/openmoko-contacts/.mtn2git_empty b/packages/openmoko-base/openmoko-session/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/openmoko-pim/openmoko-contacts/.mtn2git_empty
+++ b/packages/openmoko-base/openmoko-session/.mtn2git_empty
diff --git a/packages/openmoko-base/files/session b/packages/openmoko-base/openmoko-session/session
index 91b38a0bea..c7a773efcb 100644
--- a/packages/openmoko-base/files/session
+++ b/packages/openmoko-base/openmoko-session/session
@@ -1,17 +1,24 @@
#!/bin/sh
+export GTK_MODULES="libgtkstylus.so libgtkinput.so"
SHOWCURSOR="no"
matchbox-panel-2 \
- --start-applets=openmoko-panel-mainmenu,systray \
+ --start-applets=openmoko-panel-mainmenu,systray,startup \
--end-applets=openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock &
-#start some old-style panel plugins to get a keyboard and battery status
+# start old-style panel plugin to get a keyboard
mbinputmgr &
-mb-applet-startup-monitor &
+# set default alsa configuration
+alsactl restore 0 -f /etc/alsa/stereoout.state
+
+# start UI and dialer
openmoko-footer &
openmoko-today --desktop &
openmoko-dialer &
+
+sleep 1
+
exec matchbox-window-manager -use_titlebar no -use_cursor $SHOWCURSOR $@
diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb
index 18781493f6..7acc8fae1c 100644
--- a/packages/openmoko-base/openmoko-session_svn.bb
+++ b/packages/openmoko-base/openmoko-session_svn.bb
@@ -1,8 +1,8 @@
DESCRIPTION = "Matchbox session files for OpenMoko"
SECTION = "openmoko/base"
-RDEPENDS = "matchbox-panel-2 matchbox-wm openmoko-today gconf matchbox-applet-startup-monitor gtk-theme-clearlooks"
-PV = "0.0+svn${SRCDATE}"
-PR = "r11"
+RDEPENDS = "matchbox-panel-2 matchbox-wm openmoko-today gconf"
+PV = "0.1+svn${SRCDATE}"
+PR = "r0"
inherit openmoko-base
@@ -15,7 +15,7 @@ do_install() {
rm -fR ${D}/${sysconfdir}/.svn
rm -fR ${D}/${sysconfdir}/matchbox/.svn
chmod -R 755 ${D}/${sysconfdir}
- # DEMO only!
+ # DEMO only. Need to handle this differently in actual production images
install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/matchbox/session
}
@@ -25,5 +25,8 @@ if [ "x$D" != "x" ]; then
exit 1
fi
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/openmoko/interface/theme Clearlooks
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/openmoko/interface/theme openmoko-standard
}
+
+PACKAGE_ARCH = "all"
+
diff --git a/packages/openmoko-pim/openmoko-dates/.mtn2git_empty b/packages/openmoko-base/openmoko-sound-system/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/openmoko-pim/openmoko-dates/.mtn2git_empty
+++ b/packages/openmoko-base/openmoko-sound-system/.mtn2git_empty
diff --git a/packages/openmoko-base/openmoko-sound-system/pulseaudio b/packages/openmoko-base/openmoko-sound-system/pulseaudio
new file mode 100755
index 0000000000..76daacd3ae
--- /dev/null
+++ b/packages/openmoko-base/openmoko-sound-system/pulseaudio
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# pulseaudio This shell script starts and stops pulseaudio.
+#
+# chkconfig: 345 90 40
+# description: Pulseaudio manages the sound input/output
+# processname: pulseaudio
+
+# Source function library.
+#. /etc/rc.d/init.d/functions
+
+RETVAL=0
+prog="pulseaudio"
+
+start() {
+ echo -n "Starting the audio server..."
+ # FIXME once alsa/shm permissions have been fixed, supply --system
+ pulseaudio --resample-method=trivial -D -nF /etc/pulse/session
+ echo $prog
+}
+
+stop() {
+ # Stop daemons.
+ echo -n "Shutting down $prog: "
+ killall pulseaudio
+ echo "done"
+}
+
+# See how we were called.
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart|reload)
+ stop
+ start
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart}"
+ exit 1
+esac
+
+exit $RETVAL
diff --git a/packages/openmoko-base/openmoko-sound-system/session b/packages/openmoko-base/openmoko-sound-system/session
new file mode 100644
index 0000000000..91267b672a
--- /dev/null
+++ b/packages/openmoko-base/openmoko-sound-system/session
@@ -0,0 +1,26 @@
+#!/usr/bin/pulseaudio -nF
+
+# Create autoload entries for the device drivers
+add-autoload-sink output module-alsa-sink fragment_size=2048 sink_name=output
+add-autoload-source input module-alsa-source source_name=input
+
+# Load several protocols
+load-module module-esound-protocol-unix
+load-module module-simple-protocol-tcp
+load-module module-native-protocol-unix
+load-module module-cli-protocol-unix
+
+# Make some devices default
+set-default-sink output
+set-default-source input
+
+# Don't fail if the audio files referred to below don't exist
+.nofail
+
+# Load an audio to the sample cache for usage with module-x11-bell
+load-sample-lazy x11-bell /usr/share/openmoko/sounds/notify_doorbell.wav
+load-module module-x11-bell sample=x11-bell
+
+# Load samples
+load-sample startup /usr/share/openmoko/sounds/startup_openmoko.wav
+load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav
diff --git a/packages/openmoko-base/openmoko-sound-system_0.1.0.bb b/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
new file mode 100644
index 0000000000..671ff37f45
--- /dev/null
+++ b/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "OpenMoko Sound System"
+SECTION = "openmoko/base"
+RDEPENDS = "\
+ pulseaudio-server \
+ pulseaudio-module-alsa-sink \
+ pulseaudio-module-alsa-source \
+ pulseaudio-module-cli \
+ pulseaudio-module-esound-protocol-unix \
+ pulseaudio-module-simple-protocol-tcp \
+ pulseaudio-module-native-protocol-unix \
+ pulseaudio-module-cli-protocol-unix \
+"
+PR = "r5"
+
+inherit openmoko-base update-rc.d
+
+INITSCRIPT_NAME = "pulseaudio"
+INITSCRIPT_PARAMS = "defaults 35"
+
+SRC_URI = "file://pulseaudio \
+ file://session"
+S = "${WORKDIR}"
+
+do_install() {
+ install -d ${D}/${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/pulseaudio ${D}/${sysconfdir}/init.d/
+ install -d ${D}/${sysconfdir}/pulse
+ install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/pulse/session
+}
+
+PACKAGE_ARCH = "all"
diff --git a/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
new file mode 100644
index 0000000000..39b1e8d143
--- /dev/null
+++ b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Standard sound theme for the OpenMoko distribution"
+SECTION = "openmoko/base"
+PV = "0.1+svn${SRCDATE}"
+PR = "r0"
+
+inherit openmoko-base autotools
+
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=sounds;proto=http"
+S = "${WORKDIR}/sounds"
+
+do_install() {
+ find ${WORKDIR} -name ".svn" | xargs rm -rf
+ install -d ${D}${datadir}/openmoko/sounds
+ for i in *.mp3; do
+ cp -fpPR ${S}/$i ${D}${datadir}/openmoko/sounds/
+ done
+ for i in touchscreen_click.wav notify_doorbell.wav startup_openmoko.wav; do
+ cp -f ${S}/$i ${D}${datadir}/openmoko/sounds/
+ done
+}
+
+FILES_${PN} = "${datadir}"
+
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
index a6f90417c7..cc5d6c48d3 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
@@ -1,5 +1,7 @@
-DESCRIPTION = "Main menu for the OpenMoko panel"
-PV = "0.0.1+svn${SRCDATE}"
+DESCRIPTION = "Main menu applet for the OpenMoko panel"
+DEPENDS += "pulseaudio startup-notification"
+PV = "0.1.0+svn${SRCDATE}"
+PR = "r1"
inherit openmoko-panel-plugin
diff --git a/packages/openmoko-pim/files/.mtn2git_empty b/packages/openmoko-pim/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko-pim/files/.mtn2git_empty
diff --git a/packages/openmoko-pim/openmoko-contacts/index.theme b/packages/openmoko-pim/files/index.theme
index 4e9cf67820..4e9cf67820 100644
--- a/packages/openmoko-pim/openmoko-contacts/index.theme
+++ b/packages/openmoko-pim/files/index.theme
diff --git a/packages/openmoko-pim/openmoko-contacts/intltool-update.in b/packages/openmoko-pim/files/intltool-update.in
index 0342a2740c..0342a2740c 100644
--- a/packages/openmoko-pim/openmoko-contacts/intltool-update.in
+++ b/packages/openmoko-pim/files/intltool-update.in
diff --git a/packages/openmoko-pim/files/openmoko-dates.desktop b/packages/openmoko-pim/files/openmoko-dates.desktop
new file mode 100644
index 0000000000..f13cadeb9a
--- /dev/null
+++ b/packages/openmoko-pim/files/openmoko-dates.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Dates
+Comment=Dates
+Exec=dates
+Icon=openmoko-dates
+Terminal=false
+Type=Application
+Categories=GTK;Application;PIM;Office
+MimeType=text/x-vcard;
+SingleInstance=false
+StartupNotify=true
diff --git a/packages/openmoko-pim/files/openmoko-dates.png b/packages/openmoko-pim/files/openmoko-dates.png
new file mode 100644
index 0000000000..ebe04f4096
--- /dev/null
+++ b/packages/openmoko-pim/files/openmoko-dates.png
Binary files differ
diff --git a/packages/openmoko-pim/openmoko-contacts/stock_contact.png b/packages/openmoko-pim/files/stock_contact.png
index 123b4485ac..123b4485ac 100644
--- a/packages/openmoko-pim/openmoko-contacts/stock_contact.png
+++ b/packages/openmoko-pim/files/stock_contact.png
Binary files differ
diff --git a/packages/openmoko-pim/openmoko-contacts/stock_person.png b/packages/openmoko-pim/files/stock_person.png
index 2b1328b4e2..2b1328b4e2 100644
--- a/packages/openmoko-pim/openmoko-contacts/stock_person.png
+++ b/packages/openmoko-pim/files/stock_person.png
Binary files differ
diff --git a/packages/openmoko-pim/openmoko-dates/compile-fix.patch b/packages/openmoko-pim/openmoko-dates/compile-fix.patch
deleted file mode 100644
index 41b1f173c2..0000000000
--- a/packages/openmoko-pim/openmoko-dates/compile-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: omoko/src/dates_navigator.c
-===================================================================
---- omoko.orig/src/dates_navigator.c 2007-02-06 16:49:45.000000000 +0100
-+++ omoko/src/dates_navigator.c 2007-02-06 16:51:18.000000000 +0100
-@@ -18,7 +18,6 @@
-
- #include <string.h>
-
--#include <libedataserver/e-data-server-util.h>
- #include <libecal/e-cal.h>
- #include <libecal/e-cal-time-util.h>
- #include <libical/ical.h>
diff --git a/packages/openmoko-pim/openmoko-dates/intltool-update.in b/packages/openmoko-pim/openmoko-dates/intltool-update.in
deleted file mode 100644
index 661d8fe6ac..0000000000
--- a/packages/openmoko-pim/openmoko-dates/intltool-update.in
+++ /dev/null
@@ -1,1089 +0,0 @@
-#!@INTLTOOL_PERL@ -w
-# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
-#
-# The Intltool Message Updater
-#
-# Copyright (C) 2000-2003 Free Software Foundation.
-#
-# Intltool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 published by the Free Software Foundation.
-#
-# Intltool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-#
-# Authors: Kenneth Christiansen <kenneth@gnu.org>
-# Maciej Stachowiak
-# Darin Adler <darin@bentspoon.com>
-
-## Release information
-my $PROGRAM = "intltool-update";
-my $VERSION = "0.35.0";
-my $PACKAGE = "intltool";
-
-## Loaded modules
-use strict;
-use Getopt::Long;
-use Cwd;
-use File::Copy;
-use File::Find;
-
-## Scalars used by the option stuff
-my $HELP_ARG = 0;
-my $VERSION_ARG = 0;
-my $DIST_ARG = 0;
-my $POT_ARG = 0;
-my $HEADERS_ARG = 0;
-my $MAINTAIN_ARG = 0;
-my $REPORT_ARG = 0;
-my $VERBOSE = 0;
-my $GETTEXT_PACKAGE = "";
-my $OUTPUT_FILE = "";
-
-my @languages;
-my %varhash = ();
-my %po_files_by_lang = ();
-
-# Regular expressions to categorize file types.
-# FIXME: Please check if the following is correct
-
-my $xml_support =
-"xml(?:\\.in)*|". # http://www.w3.org/XML/ (Note: .in is not required)
-"ui|". # Bonobo specific - User Interface desc. files
-"lang|". # ?
-"glade2?(?:\\.in)*|". # Glade specific - User Interface desc. files (Note: .in is not required)
-"scm(?:\\.in)*|". # ? (Note: .in is not required)
-"oaf(?:\\.in)+|". # DEPRECATED: Replaces by Bonobo .server files
-"etspec|". # ?
-"server(?:\\.in)+|". # Bonobo specific
-"sheet(?:\\.in)+|". # ?
-"schemas(?:\\.in)+|". # GConf specific
-"pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer.
-"kbd(?:\\.in)+"; # GOK specific.
-
-my $ini_support =
-"icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec
-"desktop(?:\\.in)+|". # http://www.freedesktop.org/Standards/menu-spec
-"caves(?:\\.in)+|". # GNOME Games specific
-"directory(?:\\.in)+|". # http://www.freedesktop.org/Standards/menu-spec
-"soundlist(?:\\.in)+|". # GNOME specific
-"keys(?:\\.in)+|". # GNOME Mime database specific
-"theme(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec
-"service(?:\\.in)+"; # DBus specific
-
-my $buildin_gettext_support =
-"c|y|cs|cc|cpp|c\\+\\+|h|hh|gob|py";
-
-## Always flush buffer when printing
-$| = 1;
-
-## Sometimes the source tree will be rooted somewhere else.
-my $SRCDIR = ".";
-my $POTFILES_in;
-
-$SRCDIR = $ENV{"srcdir"} if $ENV{"srcdir"};
-$POTFILES_in = "<$SRCDIR/POTFILES.in";
-
-my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
-
-## Handle options
-GetOptions
-(
- "help" => \$HELP_ARG,
- "version" => \$VERSION_ARG,
- "dist|d" => \$DIST_ARG,
- "pot|p" => \$POT_ARG,
- "headers|s" => \$HEADERS_ARG,
- "maintain|m" => \$MAINTAIN_ARG,
- "report|r" => \$REPORT_ARG,
- "verbose|x" => \$VERBOSE,
- "gettext-package|g=s" => \$GETTEXT_PACKAGE,
- "output-file|o=s" => \$OUTPUT_FILE,
- ) or &Console_WriteError_InvalidOption;
-
-&Console_Write_IntltoolHelp if $HELP_ARG;
-&Console_Write_IntltoolVersion if $VERSION_ARG;
-
-my $arg_count = ($DIST_ARG > 0)
- + ($POT_ARG > 0)
- + ($HEADERS_ARG > 0)
- + ($MAINTAIN_ARG > 0)
- + ($REPORT_ARG > 0);
-
-&Console_Write_IntltoolHelp if $arg_count > 1;
-
-# --version and --help don't require a module name
-my $MODULE = $GETTEXT_PACKAGE || &FindPackageName || "unknown";
-
-if ($POT_ARG)
-{
- &GenerateHeaders;
- &GeneratePOTemplate;
-}
-elsif ($HEADERS_ARG)
-{
- &GenerateHeaders;
-}
-elsif ($MAINTAIN_ARG)
-{
- &FindLeftoutFiles;
-}
-elsif ($REPORT_ARG)
-{
- &GenerateHeaders;
- &GeneratePOTemplate;
- &Console_Write_CoverageReport;
-}
-elsif ((defined $ARGV[0]) && $ARGV[0] =~ /^[a-z]/)
-{
- my $lang = $ARGV[0];
-
- ## Report error if the language file supplied
- ## to the command line is non-existent
- &Console_WriteError_NotExisting("$SRCDIR/$lang.po")
- if ! -s "$SRCDIR/$lang.po";
-
- if (!$DIST_ARG)
- {
- print "Working, please wait..." if $VERBOSE;
- &GenerateHeaders;
- &GeneratePOTemplate;
- }
- &POFile_Update ($lang, $OUTPUT_FILE);
- &Console_Write_TranslationStatus ($lang, $OUTPUT_FILE);
-}
-else
-{
- &Console_Write_IntltoolHelp;
-}
-
-exit;
-
-#########
-
-sub Console_Write_IntltoolVersion
-{
- print <<_EOF_;
-${PROGRAM} (${PACKAGE}) $VERSION
-Written by Kenneth Christiansen, Maciej Stachowiak, and Darin Adler.
-
-Copyright (C) 2000-2003 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-_EOF_
- exit;
-}
-
-sub Console_Write_IntltoolHelp
-{
- print <<_EOF_;
-Usage: ${PROGRAM} [OPTION]... LANGCODE
-Updates PO template files and merge them with the translations.
-
-Mode of operation (only one is allowed):
- -p, --pot generate the PO template only
- -s, --headers generate the header files in POTFILES.in
- -m, --maintain search for left out files from POTFI