merge of 'c45039b9d53ed9e37550259ce83254ec7ac435ed'

     and 'c5975a0ccc287717a69db83c13d7d27a459c25cb'

13 files changed, 282 insertions, 63 deletions

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index c9880f2f0a..c59b353580 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -52,7 +52,7 @@ SRCREV_pn-osb-nrcit ?= "125"
 SRCREV_pn-osb-nrcore ?= "126"
 SRCREV_pn-openmoko-appearance ?= "3239"
 SRCREV_pn-openmoko-appmanager ?= "1851"
-SRCREV_pn-openmoko-appmanager2 ?= "3090"
+SRCREV_pn-openmoko-appmanager2 ?= "3271"
 SRCREV_pn-openmoko-browser2 ?= "3249"
 SRCREV_pn-openmoko-calculator ?= "2404"
 SRCREV_pn-openmoko-calculator2 ?= "3235"
@@ -63,7 +63,7 @@ SRCREV_pn-openmoko-contacts2 ?= "358"
 SRCREV_pn-openmoko-dates ?= "467"
 SRCREV_pn-openmoko-dates2 ?= "658"
 SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "3182"
+SRCREV_pn-openmoko-dialer2 ?= "3282"
 SRCREV_pn-openmoko-feedreader2 ?= "3080"
 SRCREV_pn-openmoko-finger-demo ?= "1671"
 SRCREV_pn-openmoko-firststart2 ?= "3158"
@@ -73,9 +73,9 @@ SRCREV_pn-openmoko-icon-theme-standard2 ?= "3225"
 SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3225"
 SRCREV_pn-openmoko-keyboard ?= "1631"
 SRCREV_pn-openmoko-libs ?= "2367"
-SRCREV_pn-openmoko-mediaplayer2 ?= "3263"
+SRCREV_pn-openmoko-mediaplayer2 ?= "3274"
 SRCREV_pn-openmoko-messages ?= "2276"
-SRCREV_pn-openmoko-panel-battery ?= "2897"
+SRCREV_pn-openmoko-panel-battery ?= "3272"
 SRCREV_pn-openmoko-panel-bt ?= "2896"
 SRCREV_pn-openmoko-panel-clock ?= "2567"
 SRCREV_pn-openmoko-panel-demo ?= "1622"
@@ -98,7 +98,7 @@ SRCREV_pn-openmoko-theme-standard-qvga ?= "2370"
 SRCREV_pn-openmoko-theme-standard2 ?= "3210"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "3210"
 SRCREV_pn-openmoko-today ?= "3056"
-SRCREV_pn-openmoko-today2 ?= "3180"
+SRCREV_pn-openmoko-today2 ?= "3287"
 SRCREV_pn-openmoko-today2-folders ?= "2680"
 SRCREV_pn-openmoko-worldclock2 ?= "3241"
 SRCREV_pn-openocd ?= "206"
diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb
index fce1746b22..cc69079c3a 100644
--- a/packages/gnome/gconf-dbus_svn.bb
+++ b/packages/gnome/gconf-dbus_svn.bb
@@ -7,7 +7,7 @@ RPROVIDES_${PN} = "gconf"
 RPROVIDES_${PN}-dev = "gconf-dev"
 
 PV = "2.16.0+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
 	   file://69gconfd-dbus"
@@ -35,6 +35,4 @@ do_stage() {
 do_install_append () {
 	install -d ${D}/${sysconfdir}/X11/Xsession.d
 	install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/
-        install -d ${D}/${datadir}/dbus-1.0/services/
-        install -m 644  gconf/gconf.service ${D}${datadir}/dbus-1.0/services/
 }
diff --git a/packages/kdepimpi/files/gcc42.patch b/packages/kdepimpi/files/gcc42.patch
new file mode 100644
index 0000000000..30e425aeda
--- /dev/null
+++ b/packages/kdepimpi/files/gcc42.patch
@@ -0,0 +1,13 @@
+diff --git a/kabc/secrecy.h b/kabc/secrecy.h
+index 21e22f2..3011ae9 100644
+--- a/kabc/secrecy.h
++++ b/kabc/secrecy.h
+@@ -98,5 +98,8 @@ private:
+   int mType;
+ };
+ 
++QDataStream& operator<<(QDataStream& s,const Secrecy &secrecy);
++QDataStream& operator>>(QDataStream& s,Secrecy &secrecy);
++
+ }
+ #endif
diff --git a/packages/kdepimpi/kdepimpi_2.2.7.bb b/packages/kdepimpi/kdepimpi_2.2.7.bb
index 7252d0a6f1..b8e4345b46 100644
--- a/packages/kdepimpi/kdepimpi_2.2.7.bb
+++ b/packages/kdepimpi/kdepimpi_2.2.7.bb
@@ -1,6 +1,7 @@
 SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz \
            file://gcc4.patch;patch=1 \
-	   file://qt-mt.patch;patch=1"
+	   file://qt-mt.patch;patch=1 \
+	   file://gcc42.patch;patch=1"
 
 require kdepimpi-base.inc
 
diff --git a/packages/libowl/libowl_svn.bb b/packages/libowl/libowl_svn.bb
index 7abc5e409d..d5042b78a1 100644
--- a/packages/libowl/libowl_svn.bb
+++ b/packages/libowl/libowl_svn.bb
@@ -11,10 +11,10 @@ DESCRIPTION = "OpenedHand Widget Library"
 HOMEPAGE = "http://www.o-hand.com"
 LICENSE = "LGPL"
 SECTION = "libs"
-PR = "r3"
+DEPENDS = "gtk+"
 PV = "0.0+svnr${SRCREV}"
+PR = "r3"
 
-DEPENDS = "gtk+ glib-2.0"
 PACKAGES = ""
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http"
@@ -37,12 +37,3 @@ do_stage() {
 	done
 	install -m 644 libowl/.libs/libowl.a ${STAGING_LIBDIR}/
 }
-
-do_install() {
-}
-
-do_package() {
-}
-
-do_package_write() {
-}
diff --git a/packages/linux/linux-rp.inc b/packages/linux/linux-rp.inc
index 5b630e5c61..754f3b95bf 100644
--- a/packages/linux/linux-rp.inc
+++ b/packages/linux/linux-rp.inc
@@ -13,7 +13,6 @@ BASRC = "http://www.orca.cx/zaurus/patches"
 CHSRC = "http://oz.drigon.com/patches"
 TKSRC = "http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches"
 
-EXTRA_OEMAKE = "OPENZAURUS_RELEASE=-${DISTRO_VERSION}"
 COMPATIBLE_HOST = "(arm|i.86).*-linux"
 COMPATIBLE_MACHINE = '(collie|poodle|c7x0|akita|spitz|tosa|hx2000|qemuarm|qemux86|bootcdx86|htcuniversal)'
 
@@ -45,16 +44,13 @@ CMDLINE_ROTATE_poodle = "fbcon=rotate:1"
 CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}"
 
 ###############################################################
-# Enable or disable ELPP via local.conf - default is "no"
-#
-ENABLE_ELPP = '${@bb.data.getVar("OZ_KERNEL_ENABLE_ELPP",d,1) or "no"}'
-
-###############################################################
 # module configs specific to this kernel
 #
-module_autoload_ohci-hcd_tosa = "ohci-hcd"
 module_autoload_pxaficp_ir = "pxaficp_ir"
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_pcmcia_core = "pcmcia_core"
+module_autoload_pxa2xx_cs = "pxa2xx_cs"
+module_autoload_ohci-hcd_tosa = "ohci-hcd"
 module_autoload_snd-soc-corgi_c7x0 = "snd-soc-corgi"
 module_autoload_snd-soc-spitz_akita = "snd-soc-spitz"
 module_autoload_snd-soc-spitz_spitz = "snd-soc-spitz"
@@ -96,15 +92,6 @@ do_configure() {
 
 	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
 
-	#if [ "${ENABLE_ELPP}" = "yes" ]; then
-        #        echo "# Enhanced Linux Progress Patch"  >> ${S}/.config
-        #        echo "CONFIG_FB_ELPP=y"                 >> ${S}/.config
-        #        echo "CONFIG_LOGO=y"                    >> ${S}/.config
-        #        echo "CONFIG_LOGO_LINUX_CLUT224=y"      >> ${S}/.config
-	#else
-	#	echo "# CONFIG_FB_ELPP is not set"	>> ${S}/.config
-	#fi
-
 	if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then
 		echo "CONFIG_AEABI=y"                   >> ${S}/.config
 		echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
@@ -113,28 +100,7 @@ do_configure() {
 		echo "# CONFIG_OABI_COMPAT is not set"  >> ${S}/.config
 	fi
 
-	if [ "${DISTRO}" = "openzaurus" -a "${MACHINE}" != "collie" ]; then
-		case ${MACHINE} in
-			c7x0 | akita | spitz )
-				echo "CONFIG_LOGO_OZ640_CLUT224=y"            >> ${S}/.config
-				echo "# CONFIG_LOGO_OZ480_CLUT224 is not set" >> ${S}/.config
-				echo "# CONFIG_LOGO_OZ240_CLUT224 is not set" >> ${S}/.config
-				;;
-			tosa )
-				echo "CONFIG_LOGO_OZ480_CLUT224=y"            >> ${S}/.config
-				echo "# CONFIG_LOGO_OZ640_CLUT224 is not set" >> ${S}/.config
-				echo "# CONFIG_LOGO_OZ240_CLUT224 is not set" >> ${S}/.config
-				;;
-			poodle | collie )
-				echo "CONFIG_LOGO_OZ240_CLUT224=y"            >> ${S}/.config
-				echo "# CONFIG_LOGO_OZ640_CLUT224 is not set" >> ${S}/.config
-				echo "# CONFIG_LOGO_OZ480_CLUT224 is not set" >> ${S}/.config
-				;;
-		esac 
-		echo "CONFIG_LOGO=y"                          >> ${S}/.config
-		echo "# CONFIG_LOGO_LINUX_CLUT224 is not set" >> ${S}/.config
-		echo "# CONFIG_LOGO_OHAND_CLUT224 is not set" >> ${S}/.config
-	elif [ "${DISTRO}" = "poky" -a "${MACHINE}" != "collie" ]; then
+	if [ "${DISTRO}" = "poky" -a "${MACHINE}" != "collie" ]; then
 		echo "CONFIG_LOGO=y"                          >> ${S}/.config
 		echo "CONFIG_LOGO_OHAND_CLUT224=y"            >> ${S}/.config
 		echo "# CONFIG_LOGO_OZ240_CLUT224 is not set" >> ${S}/.config
@@ -196,8 +162,7 @@ do_deploy() {
 	install -d ${DEPLOY_DIR_IMAGE}
 	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_DEPLOY_NAME}
 	cd ${DEPLOY_DIR_IMAGE}
-	rm -f ${KERNEL_SYMLINK_NAME}
-	ln -s ${KERNEL_DEPLOY_NAME} ${KERNEL_SYMLINK_NAME}
+	ln -sf ${KERNEL_DEPLOY_NAME} ${KERNEL_SYMLINK_NAME}
 	tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${MACHINE}.tgz -C ${D} lib	
 }
 
diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index bb2ad455fd..2fb0ce8177 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -35,7 +35,7 @@ do_configure_prepend() {
         #
         if [ "${TARGET_OS}" = "linux-gnueabi" -o  "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then
                 echo "CONFIG_AEABI=y"                   >> ${S}/.config
-                echo "# CONFIG_OABI_COMPAT is not set"             >> ${S}/.config
+                echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
         else
                 echo "# CONFIG_AEABI is not set"        >> ${S}/.config
                 echo "# CONFIG_OABI_COMPAT is not set"  >> ${S}/.config
diff --git a/packages/mono-xsp/.mtn2git_empty b/packages/mono-xsp/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mono-xsp/.mtn2git_empty
diff --git a/packages/mono-xsp/mono-xsp_1.2.5.bb b/packages/mono-xsp/mono-xsp_1.2.5.bb
new file mode 100644
index 0000000000..bc3386d5bd
--- /dev/null
+++ b/packages/mono-xsp/mono-xsp_1.2.5.bb
@@ -0,0 +1,229 @@
+DESCRIPTION = "Standalone web server written in C# that can be used to run ASP.NET applications"
+SECTION = "devel/mono"
+
+# Issues:
+#  - packaging of mono-xsp is still broken.  It using using the default
+#    FILES list instead of the one specified below
+#  - scripts in /usr/bin contain the wrong paths
+#
+
+
+PR = "r4"
+
+DEPENDS = "mono"
+RDEPENDS = "mono"
+
+inherit autotools mono
+
+SRC_URI = "http://go-mono.com/sources/xsp/xsp-${PV}.tar.bz2"
+
+S = "${WORKDIR}/xsp-${PV}"
+
+PACKAGES = "\
+	libmono-webserver1.0-cil \
+	libmono-webserver2.0-cil \
+	mono-xsp \
+	mono-xsp2 \
+	mono-xsp-test \
+	mono-mod-mono-server \
+	mono-mod-mono-server2 \
+	mono-xsp-doc \
+	mono-xsp-dev \
+	"
+
+FILES_libmono-webserver1.0-cil-dbg = " \
+	/usr/lib/mono/gac/Mono.WebServer/0.1.*/*.mdb \
+	"
+FILES_libmono-webserver1.0-cil = " \
+	/usr/lib/mono/gac/Mono.WebServer/0.1.*/ \
+	/usr/lib/mono/1.0/Mono.WebServer.dll \
+	"
+FILES_libmono-webserver2.0-cil-dbg = " \
+	/usr/lib/mono/gac/Mono.WebServer2/0.2.*/*.mdb \
+	"
+FILES_libmono-webserver2.0-cil = " \
+	/usr/lib/mono/gac/Mono.WebServer2/0.2.*/ \
+	/usr/lib/mono/2.0/Mono.WebServer2.dll \
+	"
+FILES_${PN}-dbg = " \
+	/usr/lib/mono/gac/xsp/1.2.*/*.mdb \
+	"
+FILES_${PN} = " \
+	/usr/lib/mono/gac/xsp/1.2.*/ \
+	/usr/lib/mono/1.0/xsp.exe \
+	/usr/bin/xsp \
+	/usr/bin/asp-state \
+	/usr/bin/dbsessmgr \
+	/usr/lib/xsp/1.0/asp-state.exe.config \
+	/usr/lib/xsp/1.0/asp-state.exe \
+	/usr/lib/xsp/1.0/dbsessmgr.exe.config \
+	/usr/lib/xsp/1.0/dbsessmgr.exe \
+	"
+FILES_mono-xsp2-dbg = " \
+	/usr/lib/mono/gac/xsp2/1.2.*/*.dbg \
+	"
+FILES_mono-xsp2 = " \
+	/usr/lib/mono/gac/xsp2/1.2.*/ \
+	/usr/lib/mono/2.0/xsp2.exe \
+	/usr/bin/xsp2 \
+	/usr/bin/asp-state2 \
+	/usr/bin/dbsessmgr2 \
+	/usr/lib/xsp/2.0/asp-state2.exe.config \
+	/usr/lib/xsp/2.0/asp-state2.exe \
+	/usr/lib/xsp/2.0/dbsessmgr2.exe.config \
+	/usr/lib/xsp/2.0/dbsessmgr2.exe \
+	"
+FILES_mono-mod-mono-server-dbg = "\
+	/usr/lib/mono/gac/mod-mono-server/1.2.*/*.mdb \
+	"
+FILES_mono-mod-mono-server = "\
+	/usr/lib/mono/gac/mod-mono-server/1.2.*/ \
+	/usr/lib/mono/1.0/mod-mono-server.exe \
+	/usr/bin/mod-mono-server \
+	"
+FILES_mono-mod-mono-server2-dbg = "\
+	/usr/lib/mono/gac/mod-mono-server2/1.2.*/*.mdb \
+	"
+FILES_mono-mod-mono-server2 = "\
+	/usr/lib/mono/gac/mod-mono-server2/1.2.*/ \
+	/usr/lib/mono/2.0/mod-mono-server2.exe \
+	/usr/bin/mod-mono-server2 \
+	"
+FILES_mono-xsp-dev = "\
+	/usr/lib/pkgconfig/xsp.pc \
+	/usr/lib/pkgconfig/xsp-2.pc \
+	"
+FILES_mono-xsp-test = " \
+	/usr/lib/xsp/test/1.1/authtest/index.aspx \
+	/usr/lib/xsp/test/1.1/authtest/login.aspx \
+	/usr/lib/xsp/test/1.1/authtest/web.config \
+	/usr/lib/xsp/test/1.1/asp.net/browsercaps.aspx \
+	/usr/lib/xsp/test/1.1/asp.net/codebehind1.aspx \
+	/usr/lib/xsp/test/1.1/asp.net/code-render.aspx \
+	/usr/lib/xsp/test/1.1/asp.net/body.inc \
+	/usr/lib/xsp/test/1.1/asp.net/header.inc \
+	/usr/lib/xsp/test/1.1/asp.net/registertest1.ascx \
+	/usr/lib/xsp/test/1.1/asp.net/registertest2.ascx \
+	/usr/lib/xsp/test/1.1/asp.net/includetest.aspx \
+	/usr/lib/xsp/test/1.1/asp.net/registertest.aspx \
+	/usr/lib/xsp/test/1.1/asp.net/server-side-object.aspx \
+	/usr/lib/xsp/test/1.1/asp.net/session1.aspx \
+	/usr/lib/xsp/test/1.1/asp.net/typedesc.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/listitem.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/temperature.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/validator1.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_adrotator.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_button.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_checkbox.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_checkboxlist.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_datagrid.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_datagrid_command.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_dropdownlist.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_hyperlink.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_image.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_imagebutton.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_label.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_linkbutton.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_listbox.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_literal.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_panel.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_placeholder.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_radiobutton.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_radiobuttonlist.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_regularexpressionvalidator.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_repeater.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_table2.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_table.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_textbox.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/web_xml.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/calendar.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/datalist.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/dbpage1.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/dbpage2.aspx \
+	/usr/lib/xsp/test/1.1/webcontrols/people.xml \
+	/usr/lib/xsp/test/1.1/webcontrols/web_adrotator.xml \
+	/usr/lib/xsp/test/1.1/webcontrols/peopletable.xsl \
+	/usr/lib/xsp/test/1.1/html/button.aspx \
+	/usr/lib/xsp/test/1.1/html/htmlanchor.aspx \
+	/usr/lib/xsp/test/1.1/html/htmlbutton.aspx \
+	/usr/lib/xsp/test/1.1/html/htmlgeneric.aspx \
+	/usr/lib/xsp/test/1.1/html/htmlimage.aspx \
+	/usr/lib/xsp/test/1.1/html/htmlinputbutton.aspx \
+	/usr/lib/xsp/test/1.1/html/htmlinputcheckbox.aspx \
+	/usr/lib/xsp/test/1.1/html/htmlinputfile.aspx \
+	/usr/lib/xsp/test/1.1/html/htmlinputhidden.aspx \
+	/usr/lib/xsp/test/1.1/html/htmlinputimage.aspx \
+	/usr/lib/xsp/test/1.1/html/htmlinputradiobutton.aspx \
+	/usr/lib/xsp/test/1.1/html/htmlinputtext.aspx \
+	/usr/lib/xsp/test/1.1/html/htmlselect.aspx \
+	/usr/lib/xsp/test/1.1/html/htmltable.aspx \
+	/usr/lib/xsp/test/1.1/html/htmltextarea.aspx \
+	/usr/lib/xsp/test/1.1/webservice/ConverterService.asmx \
+	/usr/lib/xsp/test/1.1/webservice/TestService.asmx \
+	/usr/lib/xsp/test/1.1/webservice/ServiceClient.exe.config \
+	/usr/lib/xsp/test/1.1/webservice/CompressExtension.cs \
+	/usr/lib/xsp/test/1.1/databind/databind-arraylist.aspx \
+	/usr/lib/xsp/test/1.1/databind/databind-attribute.aspx \
+	/usr/lib/xsp/test/1.1/databind/databind-class.aspx \
+	/usr/lib/xsp/test/1.1/databind/databind-template.aspx \
+	/usr/lib/xsp/test/1.1/handlers/chunked.ashx \
+	/usr/lib/xsp/test/1.1/handlers/empty.ashx \
+	/usr/lib/xsp/test/1.1/handlers/monodoc.ashx \
+	/usr/lib/xsp/test/1.1/handlers/webhandler.ashx \
+	/usr/lib/xsp/test/1.1/handlers/async.ashx \
+	/usr/lib/xsp/test/1.1/customcontrol/tabcontrol2.aspx \
+	/usr/lib/xsp/test/1.1/customcontrol/tabcontrol.aspx \
+	/usr/lib/xsp/test/ServiceClient.exe \
+	/usr/lib/xsp/test/extensions.dll \
+	/usr/lib/xsp/test/mod-mono-server.exe.config \
+	/usr/lib/xsp/test/index.aspx \
+	/usr/lib/xsp/test/index2.aspx \
+	/usr/lib/xsp/test/xsp.exe.config \
+	/usr/lib/xsp/test/web.config \
+	/usr/lib/xsp/test/global.asax \
+	/usr/lib/xsp/test/mono.png \
+	/usr/lib/xsp/test/monobutton.png \
+	/usr/lib/xsp/test/mono-powered-big.png \
+	/usr/lib/xsp/test/small-icon.png \
+	/usr/lib/xsp/test/sample.webapp \
+	/usr/lib/xsp/test/favicon.ico \
+	/usr/lib/xsp/test/mono-xsp.css \
+	/usr/lib/xsp/test/bin/codebehind1.dll \
+	/usr/lib/xsp/test/bin/typedesc.dll \
+	/usr/lib/xsp/test/bin/extensions.dll \
+	/usr/lib/xsp/test/bin/tabcontrol.dll \
+	/usr/lib/xsp/test/bin/tabcontrol2.dll \
+	/usr/lib/xsp/test/bin/treeview.dll \
+	/usr/lib/xsp/test/2.0/menu/menu1.aspx \
+	/usr/lib/xsp/test/2.0/menu/menu2.aspx \
+	/usr/lib/xsp/test/2.0/menu/stock_copy_24.png \
+	/usr/lib/xsp/test/2.0/menu/stock_cut_24.png \
+	/usr/lib/xsp/test/2.0/menu/stock_paste_24.png \
+	/usr/lib/xsp/test/2.0/treeview/populate-on-demand.aspx \
+	/usr/lib/xsp/test/2.0/treeview/populate.cs \
+	/usr/lib/xsp/test/2.0/treeview/treeview.aspx \
+	/usr/lib/xsp/test/2.0/treeview/treeview-databound.aspx \
+	/usr/lib/xsp/test/2.0/treeview/TreeLineImages/dash.gif \
+	/usr/lib/xsp/test/2.0/treeview/TreeLineImages/dashminus.gif \
+	/usr/lib/xsp/test/2.0/treeview/TreeLineImages/dashplus.gif \
+	/usr/lib/xsp/test/2.0/treeview/TreeLineImages/i.gif \
+	/usr/lib/xsp/test/2.0/treeview/TreeLineImages/l.gif \
+	/usr/lib/xsp/test/2.0/treeview/TreeLineImages/lminus.gif \
+	/usr/lib/xsp/test/2.0/treeview/TreeLineImages/lplus.gif \
+	/usr/lib/xsp/test/2.0/treeview/TreeLineImages/minus.gif \
+	/usr/lib/xsp/test/2.0/treeview/TreeLineImages/noexpand.gif \
+	/usr/lib/xsp/test/2.0/treeview/TreeLineImages/plus.gif \
+	/usr/lib/xsp/test/2.0/treeview/TreeLineImages/r.gif \
+	/usr/lib/xsp/test/2.0/treeview/TreeLineImages/rminus.gif \
+	/usr/lib/xsp/test/2.0/treeview/TreeLineImages/rplus.gif \
+	/usr/lib/xsp/test/2.0/treeview/TreeLineImages/t.gif \
+	/usr/lib/xsp/test/2.0/treeview/TreeLineImages/tminus.gif \
+	/usr/lib/xsp/test/2.0/treeview/TreeLineImages/tplus.gif \
+	/usr/lib/xsp/test/2.0/masterpages/simple.master \
+	/usr/lib/xsp/test/2.0/masterpages/simple.aspx \
+	/usr/lib/xsp/test/2.0/masterpages/frame.master \
+	/usr/lib/xsp/test/2.0/masterpages/content1.aspx \
+	/usr/lib/xsp/test/2.0/masterpages/content2.aspx \
+	"
+
+
diff --git a/packages/openmoko2/openmoko-tasks2/.mtn2git_empty b/packages/openmoko2/openmoko-tasks2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko2/openmoko-tasks2/.mtn2git_empty
diff --git a/packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop b/packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop
new file mode 100644
index 0000000000..f9e813a734
--- /dev/null
+++ b/packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Tasks
+Comment=What you need to do
+Exec=tasks
+Icon=openmoko-tasks
+Terminal=false
+Type=Application
+Categories=GTK;Application;PIM;Office
+MimeType=text/x-vcard;
+SingleInstance=true
+StartupNotify=true
diff --git a/packages/openmoko2/openmoko-tasks2/openmoko-tasks.png b/packages/openmoko2/openmoko-tasks2/openmoko-tasks.png
new file mode 100644
index 0000000000..f28d1ade99
--- /dev/null
+++ b/packages/openmoko2/openmoko-tasks2/openmoko-tasks.png
diff --git a/packages/openmoko2/openmoko-tasks2_svn.bb b/packages/openmoko2/openmoko-tasks2_svn.bb
index 8a1fcf267f..48ec113884 100644
--- a/packages/openmoko2/openmoko-tasks2_svn.bb
+++ b/packages/openmoko2/openmoko-tasks2_svn.bb
@@ -3,11 +3,21 @@ SECTION = "openmoko/pim"
 DEPENDS = "dbus-glib eds-dbus libmokoui2"
 RDEPENDS = "libedata-cal"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 inherit openmoko2
 
-SRC_URI = "svn://svn.o-hand.com/repos/tasks/;module=trunk;proto=http"
+SRC_URI = "svn://svn.o-hand.com/repos/tasks/;module=trunk;proto=http \
+           file://openmoko-tasks.desktop \
+           file://openmoko-tasks.png"
 S = "${WORKDIR}/trunk"
 
 EXTRA_OECONF = "--enable-omoko --disable-gtk"
+
+do_install_append() {
+	install -d ${D}${datadir}/applications
+	install -m 0644 ${WORKDIR}/openmoko-tasks.desktop ${D}${datadir}/applications/tasks.desktop
+	install -d ${D}${datadir}/pixmaps
+	install -m 0644 ${WORKDIR}/openmoko-tasks.png ${D}${datadir}/pixmaps
+}
+