[oe-commits] org.oe.dev merge of '1a392ab8017f1647946ea5d52f90a38c2eb55d50'

[oe commit]

merge of '1a392ab8017f1647946ea5d52f90a38c2eb55d50'
     and '641f6b995e880a8d62279f125ffae431261ad39b'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 88e2d83dfde43e556fcd378151559f1b228c1248
ViewMTN: http://monotone.openembedded.org/revision/info/88e2d83dfde43e556fcd378151559f1b228c1248
Files:
1
conf/distro/angstrom-2008.1.conf
packages/tasks/task-openmoko-feed.bb
Diffs:

#
# mt diff -r1a392ab8017f1647946ea5d52f90a38c2eb55d50 -r88e2d83dfde43e556fcd378151559f1b228c1248
#
# 
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [487c3506ad8cb3ca5d78cfd66fa53492cacba1af]
#    to [7cf6cf9abb330a4454395b20a82b0387f94dab20]
# 
============================================================
--- conf/distro/angstrom-2008.1.conf	487c3506ad8cb3ca5d78cfd66fa53492cacba1af
+++ conf/distro/angstrom-2008.1.conf	7cf6cf9abb330a4454395b20a82b0387f94dab20
@@ -40,5 +40,5 @@ PREFERRED_VERSION_glib-2.0              
 #Prefer a newer GTK+ and friends
 PREFERRED_VERSION_gtk+             	= "2.12.0"
 PREFERRED_VERSION_glib-2.0              = "2.14.0"
+PREFERRED_VERSION_pango                 = "1.18.1"
 
-


#
# mt diff -r641f6b995e880a8d62279f125ffae431261ad39b -r88e2d83dfde43e556fcd378151559f1b228c1248
#
# 
# 
# patch "packages/tasks/task-openmoko-feed.bb"
#  from [8bae7a09e4956d7750cdd285857089383e895865]
#    to [ef020702ddfe8a9efbf7175aa35503330afaee31]
# 
============================================================
--- packages/tasks/task-openmoko-feed.bb	8bae7a09e4956d7750cdd285857089383e895865
+++ packages/tasks/task-openmoko-feed.bb	ef020702ddfe8a9efbf7175aa35503330afaee31
@@ -1,13 +1,14 @@ LICENSE = "MIT"
 DESCRIPTION = "OpenMoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r13"
+PR = "r14"
 
 inherit task
 
 RDEPENDS_task-openmoko-feed = "\
   aspell enchant \
   bluez-hcidump \
+  bootchart \
   eet evas ecore embryo epsilon edje efreet emotion epdf \
   exhibit edje-viewer \
   free42-vga \