summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-11-26 12:09:28 +0100
committerKoen Kooi <koen@openembedded.org>2009-11-26 12:09:28 +0100
commitdfd703169253ab4dc5946a4a9268505f46de3147 (patch)
treeeb1e15d73729ee23988efec016fc0324d50bfc50
parentcd7829fa47da4180c754964854d374b43878c74d (diff)
parent55653a936923c4d52aa3e9f13fe1dfa619273ea5 (diff)
downloadopenembedded-dfd703169253ab4dc5946a4a9268505f46de3147.tar.gz
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
-rw-r--r--conf/distro/include/sane-srcrevs.inc2
-rw-r--r--recipes/tasks/task-shr-minimal.bb3
2 files changed, 3 insertions, 2 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 2c87db6e84..ce988699db 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -189,7 +189,7 @@ SRCREV_pn-mobile-broadband-provider-info ?= "bc536218490377ccbd09c4e5858d37c91c2
SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
SRCREV_pn-moko-gtk-engine ?= "4734"
SRCREV_pn-mokoko ?= "127"
-SRCREV_pn-mokonnect ?= "111"
+SRCREV_pn-mokonnect ?= "112"
SRCREV_pn-mpd-alsa ?= "6952"
SRCREV_pn-mplayer-maemo ?= "342"
SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257"
diff --git a/recipes/tasks/task-shr-minimal.bb b/recipes/tasks/task-shr-minimal.bb
index c2eb32ad00..1507ded9da 100644
--- a/recipes/tasks/task-shr-minimal.bb
+++ b/recipes/tasks/task-shr-minimal.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "SHR Lite Image Feed"
-PR = "r16"
+PR = "r17"
PV = "2.0"
LICENSE = "GPL"
@@ -114,6 +114,7 @@ RDEPENDS_${PN}-audio_append_om-gta02 = "\
RDEPENDS_${PN}-x = "\
glibc-utils \
glibc-charmap-utf-8 \
+ e-wm-menu-shr \
shr-theme-gry \
etk-theme-shr \
${@get_rdepends(bb, d)} \