[oe-commits] org.oe.dev merge of '0cf8f2c5ee855d39a6405f986c68c060c315c548'

[oe commit]

merge of '0cf8f2c5ee855d39a6405f986c68c060c315c548'
     and '4f77470c64f631cf18c5d73d963e41e28fe097bb'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: ce9648eef13f1ef5d8dff88dc64af875993364e9
ViewMTN: http://monotone.openembedded.org/revision/info/ce9648eef13f1ef5d8dff88dc64af875993364e9
Files:
1
packages/openmoko2/openmoko-appmanager2_svn.bb
packages/tasks/task-openmoko.bb
conf/distro/include/sane-srcrevs.inc
Diffs:

#
# mt diff -r0cf8f2c5ee855d39a6405f986c68c060c315c548 -rce9648eef13f1ef5d8dff88dc64af875993364e9
#
# 
# 
# patch "packages/openmoko2/openmoko-appmanager2_svn.bb"
#  from [cd5979321d700d7dee8025135947a97abe7587da]
#    to [8808bd67fd00d89f7b8ea151d37f6cfd24aba0eb]
# 
# patch "packages/tasks/task-openmoko.bb"
#  from [853e5cf4effc206059d9e3955df4a6d161c7188b]
#    to [870be401b6ac910ccf7cbc8611c17b7ebeb32882]
# 
============================================================
--- packages/openmoko2/openmoko-appmanager2_svn.bb	cd5979321d700d7dee8025135947a97abe7587da
+++ packages/openmoko2/openmoko-appmanager2_svn.bb	8808bd67fd00d89f7b8ea151d37f6cfd24aba0eb
@@ -5,3 +5,6 @@ inherit openmoko2 
 PR = "r0"
 
 inherit openmoko2 
+
+FILES_${PN} += "/usr/share/openmoko-appmanager"
+
============================================================
--- packages/tasks/task-openmoko.bb	853e5cf4effc206059d9e3955df4a6d161c7188b
+++ packages/tasks/task-openmoko.bb	870be401b6ac910ccf7cbc8611c17b7ebeb32882
@@ -1,8 +1,8 @@ PROVIDES = "task-openmoko-everything"
 DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
-PR = "r65"
+PR = "r66"
 
 inherit task
 
@@ -135,6 +135,8 @@ RDEPENDS_task-openmoko-pim = "\
   openmoko-contacts2 \
   openmoko-dates2 \
   openmoko-feedreader2 \
+  openmoko-browser2 \
+  openmoko-appmanager2 \
   openmoko-tasks2 \
   openmoko-mediaplayer2 \
 #  openmoko-messages \


#
# mt diff -r4f77470c64f631cf18c5d73d963e41e28fe097bb -rce9648eef13f1ef5d8dff88dc64af875993364e9
#
# 
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [20a517059661d41439c3a887c4222a0ecf489389]
#    to [094e6ff87045ec722ce3d1558347fe856bcf813c]
# 
============================================================
--- conf/distro/include/sane-srcrevs.inc	20a517059661d41439c3a887c4222a0ecf489389
+++ conf/distro/include/sane-srcrevs.inc	094e6ff87045ec722ce3d1558347fe856bcf813c
@@ -54,7 +54,7 @@ SRCREV_pn-openmoko-dialer ?= "2811"
 SRCREV_pn-openmoko-dates ?= "467"
 SRCREV_pn-openmoko-dates2 ?= "617"
 SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "3150"
+SRCREV_pn-openmoko-dialer2 ?= "3182"
 SRCREV_pn-openmoko-feedreader2 ?= "3080"
 SRCREV_pn-openmoko-finger-demo ?= "1671"
 SRCREV_pn-openmoko-firststart2 ?= "2873"
@@ -72,7 +72,7 @@ SRCREV_pn-openmoko-panel-gps ?= "2900"
 SRCREV_pn-openmoko-panel-demo ?= "1622"
 SRCREV_pn-openmoko-panel-demo-simple ?= "1328"
 SRCREV_pn-openmoko-panel-gps ?= "2900"
-SRCREV_pn-openmoko-panel-gsm ?= "3074"
+SRCREV_pn-openmoko-panel-gsm ?= "3185"
 SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
 SRCREV_pn-openmoko-panel-usb ?= "2893"
 SRCREV_pn-openmoko-session ?= "152"
@@ -89,7 +89,7 @@ SRCREV_pn-openmoko-today ?= "3056"
 SRCREV_pn-openmoko-theme-standard2 ?= "3044"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "2964"
 SRCREV_pn-openmoko-today ?= "3056"
-SRCREV_pn-openmoko-today2 ?= "3169"
+SRCREV_pn-openmoko-today2 ?= "3180"
 SRCREV_pn-openmoko-today2-folders ?= "2680"
 SRCREV_pn-openocd ?= "206"
 SRCREV_pn-openocd-native ?= "206"