r2267 - in trunk/oe: conf/distro/include packages/openmoko-base packages/openmoko-base/openmoko-session packages/tasks

[stefan at sita.openmoko.org]

Author: stefan
Date: 2007-06-15 12:24:01 +0200 (Fri, 15 Jun 2007)
New Revision: 2267

Modified:
   trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
   trunk/oe/conf/distro/include/sane-srcdates.inc
   trunk/oe/packages/openmoko-base/openmoko-session/session
   trunk/oe/packages/openmoko-base/openmoko-session_svn.bb
   trunk/oe/packages/tasks/task-openmoko.bb
Log:
* Introduce the yesterday merged startup applet. This is the version we pushed
  upstream. Once it is proven stable openmoko-panel-startup will be removed.


Modified: trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
===================================================================
--- trunk/oe/conf/distro/include/preferred-openmoko-versions.inc	2007-06-15 10:22:26 UTC (rev 2266)
+++ trunk/oe/conf/distro/include/preferred-openmoko-versions.inc	2007-06-15 10:24:01 UTC (rev 2267)
@@ -83,4 +83,4 @@
 SRCDATE_openmoko-panel-gps = "now"
 SRCDATE_openmoko-panel-bt = "now"
 SRCDATE_openmoko-panel-usb = "now"
-SRCDATE_openmoko-panel-startup = "now"
+#SRCDATE_openmoko-panel-startup = "now"

Modified: trunk/oe/conf/distro/include/sane-srcdates.inc
===================================================================
--- trunk/oe/conf/distro/include/sane-srcdates.inc	2007-06-15 10:22:26 UTC (rev 2266)
+++ trunk/oe/conf/distro/include/sane-srcdates.inc	2007-06-15 10:24:01 UTC (rev 2267)
@@ -29,7 +29,7 @@
 SRCDATE_matchbox-desktop-2 ?= "20070528"
 SRCDATE_matchbox-keyboard ?= "20060612"
 SRCDATE_matchbox-panel ?= "20060612"
-SRCDATE_matchbox-panel-2 ?= "20070415"
+SRCDATE_matchbox-panel-2 ?= "20070615"
 SRCDATE_matchbox-panel-manager ?= "20060612"
 SRCDATE_matchbox-stroke ?= "20060612"
 SRCDATE_matchbox-themes-extra ?= "20060612"

Modified: trunk/oe/packages/openmoko-base/openmoko-session/session
===================================================================
--- trunk/oe/packages/openmoko-base/openmoko-session/session	2007-06-15 10:22:26 UTC (rev 2266)
+++ trunk/oe/packages/openmoko-base/openmoko-session/session	2007-06-15 10:24:01 UTC (rev 2267)
@@ -2,8 +2,8 @@
 
 SHOWCURSOR="no"
 
-matchbox-panel \
-  --start-applets=openmoko-panel-mainmenu,systray,openmoko-panel-startup \
+matchbox-panel-2 \
+  --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 old-style panel plugin to get a keyboard

Modified: trunk/oe/packages/openmoko-base/openmoko-session_svn.bb
===================================================================
--- trunk/oe/packages/openmoko-base/openmoko-session_svn.bb	2007-06-15 10:22:26 UTC (rev 2266)
+++ trunk/oe/packages/openmoko-base/openmoko-session_svn.bb	2007-06-15 10:24:01 UTC (rev 2267)
@@ -2,7 +2,7 @@
 SECTION = "openmoko/base"
 RDEPENDS = "matchbox-panel-2 matchbox-wm gconf"
 PV = "0.1+svn${SRCDATE}"
-PR = "r4"
+PR = "r5"
 
 inherit openmoko-base
 

Modified: trunk/oe/packages/tasks/task-openmoko.bb
===================================================================
--- trunk/oe/packages/tasks/task-openmoko.bb	2007-06-15 10:22:26 UTC (rev 2266)
+++ trunk/oe/packages/tasks/task-openmoko.bb	2007-06-15 10:24:01 UTC (rev 2267)
@@ -105,7 +105,7 @@
   openmoko-panel-clock \
   openmoko-panel-usb \
   openmoko-panel-gps \
-  openmoko-panel-startup \
+#  openmoko-panel-startup \
 "
 
 #