merge of 'b15a72d39d751ca408617bf95b875f434f8a6377'

     and 'e96694990902ffb76becba56bab471a323fab49e'

8 files changed, 33 insertions, 53 deletions

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/machined_svn.bb b/packages/gpephone/machined_svn.bb
index 549071fdb0..5c96cfa97c 100644
--- a/packages/gpephone/machined_svn.bb
+++ b/packages/gpephone/machined_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Device abstraction and support daemon"
 SECTION = "gpephone"
 PRIORITY = "required"
 LICENSE = "GPL"
-DEPENDS = "glib-2.0"
+DEPENDS = "glib-2.0 dbus-glib gtk+"
 PV = "0.1+svn-${SRCDATE}"
 PR = "r0"
 
@@ -13,6 +13,3 @@ inherit gpephone pkgconfig autotools
 SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/;module=${PN}"
 
 S = "${WORKDIR}/${PN}"
-
-#FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/helper/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pixmaps"
-
diff --git a/packages/gpephone/ptim-manager_svn.bb b/packages/gpephone/ptim-manager_svn.bb
index 8c86d4cfeb..5c8042c5d5 100644
--- a/packages/gpephone/ptim-manager_svn.bb
+++ b/packages/gpephone/ptim-manager_svn.bb
@@ -4,14 +4,13 @@ PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers libiac"
 PV = "0.1+svn-${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
 inherit gpephone pkgconfig autotools
 
-SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=immanager \
-           file://gtkmodule-location.patch;patch=1;pnum=0"
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=immanager"
 
 S = "${WORKDIR}/immanager"
 
diff --git a/packages/images/openmoko-devel-image.bb b/packages/images/openmoko-devel-image.bb
index 56890b5c34..9c72533f8d 100644
--- a/packages/images/openmoko-devel-image.bb
+++ b/packages/images/openmoko-devel-image.bb
@@ -1,7 +1,5 @@
 require openmoko-image.bb
 
 export PACKAGE_INSTALL += "\
-  task-openmoko-demo \
   task-openmoko-debug \
-  task-openmoko-examples \
 "
diff --git a/packages/images/openmoko-image.bb b/packages/images/openmoko-image.bb
index 632963076c..0f1359fb19 100644
--- a/packages/images/openmoko-image.bb
+++ b/packages/images/openmoko-image.bb
@@ -14,7 +14,6 @@ export PACKAGE_INSTALL = "\
   task-openmoko-phone \
   task-openmoko-finger \
   task-openmoko-pim \
-  task-openmoko-demo \
   "
 
 DEPENDS = "\
diff --git a/packages/openmoko-base/openmoko-theme-standard_svn.bb b/packages/openmoko-base/openmoko-theme-standard_svn.bb
index 6265526de6..8bf59ac707 100644
--- a/packages/openmoko-base/openmoko-theme-standard_svn.bb
+++ b/packages/openmoko-base/openmoko-theme-standard_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
 SECTION = "openmoko/base"
 PV = "0.0+svn${SRCDATE}"
-PR = "r4"
+PR = "r5"
 
 inherit openmoko-base
 
@@ -21,5 +21,7 @@ do_install() {
 	echo 'include "${datadir}/themes/openmoko-standard/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
 }
 
+CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc"
+
 PACKAGE_ARCH = "all"
 FILES_${PN} = "${datadir} ${sysconfdir}"
diff --git a/packages/openmoko2/openmoko-theme-standard2_svn.bb b/packages/openmoko2/openmoko-theme-standard2_svn.bb
index b925edce1a..3af6dc78a9 100644
--- a/packages/openmoko2/openmoko-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-theme-standard2_svn.bb
@@ -6,7 +6,7 @@ PR = "r1"
 
 inherit openmoko2
 
-SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2008/artwork/themes;module=openmoko-standard-2;proto=http"
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/themes;module=openmoko-standard-2;proto=http"
 S = "${WORKDIR}/openmoko-standard-2"
 
 do_install() {
@@ -19,5 +19,7 @@ do_install() {
 	echo 'include "${datadir}/themes/openmoko-standard-2/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
 }
 
+CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc"
+
 PACKAGE_ARCH = "all"
 FILES_${PN} = "${datadir} ${sysconfdir}"
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index 8ef66b6080..94836847d4 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
-PR = "r49"
+PR = "r50"
 
 ALLOW_EMPTY = "1"
 PACKAGE_ARCH = "all"
@@ -65,9 +65,8 @@ RDEPENDS_task-openmoko-ui = "\
   xset \
   xrandr \
   settings-daemon \
-  openmoko-common \
-  openmoko-session \
-  openmoko-theme-standard \
+  openmoko-session2 \
+  openmoko-theme-standard2 \
   openmoko-icon-theme-standard \
   openmoko-sound-system \
   openmoko-sound-theme-standard \
@@ -83,10 +82,10 @@ RDEPENDS_task-openmoko-base = "\
   matchbox-panel-2 \
   matchbox-panel-2-applets \
   matchbox-applet-inputmanager \
-  openmoko-appmanager \
+#  openmoko-appmanager \
+  matchbox-keyboard \
+  matchbox-stroke \
   openmoko-keyboard \
-  openmoko-footer \
-  openmoko-taskmanager \
   openmoko-panel-mainmenu \
   openmoko-panel-battery \
   openmoko-panel-bt \
@@ -102,7 +101,7 @@ DESCRIPTION_task-openmoko-phone = "OpenMoko: GSM and GPRS Phone Services"
 RDEPENDS_task-openmoko-phone = "\
   gsmd \
   libgsmd-tools \
-  openmoko-dialer \
+  openmoko-dialer2 \
   openmoko-panel-gsm \
 #  ppp \
 "
@@ -112,7 +111,7 @@ RDEPENDS_task-openmoko-phone = "\
 #
 DESCRIPTION_task-openmoko-finger = "OpenMoko: Finger UI Applications"
 RDEPENDS_task-openmoko-finger = "\
-  openmoko-calculator \
+#  openmoko-calculator \
 "
 
 #
@@ -121,12 +120,10 @@ RDEPENDS_task-openmoko-finger = "\
 DESCRIPTION_task-openmoko-pim = "OpenMoko: PIM Applications"
 RDEPENDS_task-openmoko-pim = "\
   eds-dbus \
-  openmoko-contacts \
-  openmoko-dates \
-  openmoko-tasks \
-  openmoko-today \
-  openmoko-messages \
-  openmoko-rssreader \
+  openmoko-contacts2 \
+  openmoko-today2 \
+#  openmoko-messages \
+#  openmoko-rssreader \
 "
 
 #
@@ -139,32 +136,6 @@ RDEPENDS_task-openmoko-net = "\
 "
 
 #
-# task-openmoko-demo
-#
-DESCRIPTION_task-openmoko-demo = "OpenMoko: Demo Applications"
-RDEPENDS_task-openmoko-demo = "\
-  matchbox-desktop-2 \
-  matchbox-keyboard \
-  matchbox-stroke \
-  matchbox-config-gtk \
-  xcursor-transparent-theme \
-  web \
-  mtpaint \
-"
-
-#
-# task-openmoko-examples
-#
-DESCRIPTION_task-openmoko-examples = "OpenMoko: Example Applications"
-RDEPENDS_task-openmoko-examples = "\
-  openmoko-stylus-demo-simple \
-  openmoko-stylus-demo \
-  openmoko-finger-demo \
-  openmoko-panel-demo-simple \
-  openmoko-panel-demo \
-  openmoko-chordmaster"
-
-#
 # task-openmoko-debug
 #
 DESCRIPTION_task-openmoko-debug = "OpenMoko: Debugging Tools"