[oe-commits] Jan Lübbe : fso-image: add midori (0.1.2) and bump frameworkd

[GIT User account]

Module: openembedded.git
Branch: fso/milestone5.5
Commit: 1daf1de20c1f9f358973c67b3c6427b010e16635
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=1daf1de20c1f9f358973c67b3c6427b010e16635

Author: Jan Lübbe <jluebbe at debian.org>
Date:   Mon Apr 27 15:00:30 2009 +0000

fso-image: add midori (0.1.2) and bump frameworkd

---

 conf/distro/include/preferred-om-2008-versions.inc |    2 +-
 conf/distro/include/sane-srcrevs.inc               |    2 +-
 recipes/images/fso-image.bb                        |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 05e0f14..887864b 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1226,7 +1226,7 @@ PREFERRED_VERSION_miau ?= "0.5.3"
 PREFERRED_VERSION_microcom ?= "1.02"
 PREFERRED_VERSION_micro-emacs ?= "20060909"
 PREFERRED_VERSION_microwindows ?= "0.90"
-PREFERRED_VERSION_midori ?= "0.0.17"
+PREFERRED_VERSION_midori ?= "0.1.2"
 PREFERRED_VERSION_midpath-backend-alsa ?= "0.2+0.3rc2"
 PREFERRED_VERSION_midpath-backend-escher ?= "0.2+0.3rc2"
 PREFERRED_VERSION_midpath-backend-esd ?= "0.2+0.3rc2"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 94126e1..4dff326 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -50,7 +50,7 @@ SRCREV_pn-epydial ?= "215"
 SRCREV_pn-etk-theme-ninja ?= "5"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-flashrom ?= "3682"
-SRCREV_pn-frameworkd ?= "9c746079d020f483257c64200cd0e18ca8586f13"
+SRCREV_pn-frameworkd ?= "b325493722f765e2c53392f1ef79dddb35d8d74d"
 SRCREV_pn-frameworkd-devel ?= "${SRCREV_pn-frameworkd}"
 SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136"
 SRCREV_pn-fso-abyss ?= "6ed342f833930474ac506cbaad705c0d8beaa71f"
diff --git a/recipes/images/fso-image.bb b/recipes/images/fso-image.bb
index 7a6cb49..9cdcad3 100644
--- a/recipes/images/fso-image.bb
+++ b/recipes/images/fso-image.bb
@@ -5,9 +5,10 @@
 require fso-image.inc
 
 PV = "1.1"
-PR = "r4"
+PR = "r5"
 
 ZHONE_INSTALL = "\
   task-fso-compliance \
   zhone \
+  midori \
 "