[oe-commits] org.oe.dev merge of '4363471130869dabc3d90ccdcff57628e3ce25e1'

[daniel commit]

merge of '4363471130869dabc3d90ccdcff57628e3ce25e1'
     and '946f6774a1edb3f5f17a2c7edc4dcb1d0a8be5fe'

Author: daniel at openembedded.org
Branch: org.openembedded.dev
Revision: 5ffc521869ddec2cf6839cf5819210f49b24e302
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5ffc521869ddec2cf6839cf5819210f49b24e302
Files:
1
packages/tasks/task-openmoko.bb
packages/openmoko2/openmoko-icon-theme-standard_svn.bb
packages/openmoko2/openmoko-theme-standard2_svn.bb
Diffs:

#
# mt diff -r4363471130869dabc3d90ccdcff57628e3ce25e1 -r5ffc521869ddec2cf6839cf5819210f49b24e302
#
# 
# 
# patch "packages/tasks/task-openmoko.bb"
#  from [70958e9a532d30c1db1e1fb965132fe55518f45a]
#    to [a87ce3caddce4b12644a8550b43e5aaa8989d5d8]
# 
============================================================
--- packages/tasks/task-openmoko.bb	70958e9a532d30c1db1e1fb965132fe55518f45a
+++ packages/tasks/task-openmoko.bb	a87ce3caddce4b12644a8550b43e5aaa8989d5d8
@@ -86,7 +86,6 @@ RDEPENDS_task-openmoko-base = "\
   matchbox-keyboard \
   matchbox-stroke \
   openmoko-keyboard \
-  openmoko-panel-mainmenu \
   openmoko-panel-battery \
   openmoko-panel-bt \
   openmoko-panel-clock \


#
# mt diff -r946f6774a1edb3f5f17a2c7edc4dcb1d0a8be5fe -r5ffc521869ddec2cf6839cf5819210f49b24e302
#
# 
# 
# patch "packages/openmoko2/openmoko-icon-theme-standard_svn.bb"
#  from [098dd7669bcd0356b71b33296b1b20ea51151034]
#    to [3889e0cbc8b415f8ccc206cf34c0b2d3f5324e5b]
# 
# patch "packages/openmoko2/openmoko-theme-standard2_svn.bb"
#  from [35b2127baed9a06ff6abae932dbd14077257dbde]
#    to [fe0910c4f9d4b2220369f293fdf57c3fcb0b1bf4]
# 
============================================================
--- packages/openmoko2/openmoko-icon-theme-standard_svn.bb	098dd7669bcd0356b71b33296b1b20ea51151034
+++ packages/openmoko2/openmoko-icon-theme-standard_svn.bb	3889e0cbc8b415f8ccc206cf34c0b2d3f5324e5b
@@ -1,6 +1,6 @@ SECTION = "openmoko/base"
 DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution"
 SECTION = "openmoko/base"
-PV = "0.1+svn${SRCDATE}"
+PV = "0.1.0+svn${SRCDATE}"
 PR = "r1"
 
 inherit openmoko-base autotools
============================================================
--- packages/openmoko2/openmoko-theme-standard2_svn.bb	35b2127baed9a06ff6abae932dbd14077257dbde
+++ packages/openmoko2/openmoko-theme-standard2_svn.bb	fe0910c4f9d4b2220369f293fdf57c3fcb0b1bf4
@@ -1,7 +1,7 @@ RCONFLICTS = "openmoko-theme-standard"
 DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
 SECTION = "openmoko/base"
 RCONFLICTS = "openmoko-theme-standard"
-PV = "0.1.0+srvn${SRCDATE}"
+PV = "0.1.0+svn${SRCDATE}"
 PR = "r1"
 
 inherit openmoko2