[oe-commits] Martin Jansa : shr: bump SRCREVs for SHR projects, fsogsmd, remove frameworkd-config from autorev

[git version control]

Module: openembedded.git
Branch: shr/testing2010
Commit: 0cc25429df56114f7dbf2fca8bbef63b3ef28b64
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=0cc25429df56114f7dbf2fca8bbef63b3ef28b64

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Mar 17 14:01:04 2010 +0100

shr: bump SRCREVs for SHR projects, fsogsmd, remove frameworkd-config from autorev

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 conf/distro/include/sane-srcrevs-fso.inc |    2 +-
 conf/distro/include/sane-srcrevs.inc     |   26 ++++++++++++--------------
 conf/distro/include/shr-autorev.inc      |    5 -----
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index c95d496..f39f47a 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -7,7 +7,7 @@ SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fso-boot ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsodatad ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsodeviced ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsogsmd ?= "8e89c8dbae569a08cac246a3805fca20988c0ad1"
 SRCREV_pn-fsolocationd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsomusicd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 9fc3fee..9947ebb 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -14,7 +14,7 @@
 SRCREV_pn-accelges ?= "206"
 SRCREV_pn-advancedcaching ?= "9c3661f5573d2dd712437f1590070153d12e4c02"
 SRCREV_pn-aircrack-ng ?= "802"
-SRCREV_pn-alsa-scenarii-shr ?= "2b62d1c9b02da047071105a7b5695acd6c6dbcca"
+SRCREV_pn-alsa-scenarii-shr ?= "8e89c8dbae569a08cac246a3805fca20988c0ad1"
 SRCREV_pn-alsa-scenario ?= "8bd7f83d847424eb44704cf1649974b2fda8d8f1"
 SRCREV_pn-aufs2-util ?= "f35ba2292fe40aa94aa83713e0b2719f35a25768"
 SRCREV_pn-bfin-uclibc ?= "1857"
@@ -60,7 +60,7 @@ SRCREV_pn-ezx-gen-blob ?= "2426"
 SRCREV_pn-ezxd ?= "2074"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-flashrom ?= "3682"
-SRCREV_pn-frameworkd-config-shr ?= "2b62d1c9b02da047071105a7b5695acd6c6dbcca"
+SRCREV_pn-frameworkd-config-shr ?= "8e89c8dbae569a08cac246a3805fca20988c0ad1"
 SRCREV_pn-frameworkd-config-shr_SHR_REV ?= ${SRCREV_pn-frameworkd-config-shr}
 SRCREV_pn-fsod ?= "2a33e5ffe96c611e6a6b8b6c33d2a83ba656f55b"
 SRCREV_pn-fstests ?= "204"
@@ -97,8 +97,8 @@ SRCREV_pn-libiac ?= "1590"
 SRCREV_pn-libmodulo ?= "7d2f657d248bd86377e66c329aa6826459d406da"
 SRCREV_pn-libnl2 ?= "8808743839b0f459394ecd00cb0f7c1896c0ab7a"
 SRCREV_pn-libowl ?= "277"
-SRCREV_pn-libphone-ui ?= "18e9bce8ef0cfca067674e1a1b7300949a227d57"
-SRCREV_pn-libphone-ui-shr ?= "a642fc4689c8f4256b4c531aa53619dd6bc58391"
+SRCREV_pn-libphone-ui = "97fda168d8d5f4771267305ea0672b4bc7756957"
+SRCREV_pn-libphone-ui-shr = "46c991d348419f504775df2d602158a7dfdc9bf1"
 SRCREV_pn-librfid ?= "2094"
 SRCREV_pn-libsnmp-perl ?= "17367"
 SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb"
@@ -133,13 +133,6 @@ SRCREV_pn-mplayer-maemo ?= "342"
 SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257"
 SRCREV_pn-multitap-pad ?= "373"
 SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
-<<<<<<< HEAD:conf/distro/include/sane-srcrevs.inc
-SRCREV_pn-navit ?= "2934"
-SRCREV_pn-navit-icons ?= "2927"
-SRCREV_pn-neod ?= "4617"
-SRCREV_pn-neomis ?= "6"
-=======
->>>>>>> 67b3bae... sane-srcrevs: move SRCREVs to recipes for openmoko related svn recipes:conf/distro/include/sane-srcrevs.inc
 SRCREV_pn-net-snmp ?= "17367"
 SRCREV_pn-netsurf ?= "3859"
 SRCREV_pn-oh-puzzles ?= "22"
@@ -167,9 +160,9 @@ SRCREV_pn-osb-nrcit ?= "125"
 SRCREV_pn-osb-nrcore ?= "126"
 SRCREV_pn-packagekit ?= "96823118e98515dd41748e8c7bdb9cf7b1d4a95f"
 SRCREV_pn-paroli ?= "bb9fb1969acdfbaa48b55902675a6d8949014c6d"
-SRCREV_pn-phonefsod ?= "5f6c7b084c7103546924a5da9910f0c8da0d23bf"
-SRCREV_pn-phoneui-apps ?= "b3ab560b66088dbbd183e060d3166e0ebeb2c55e"
-SRCREV_pn-phoneuid ?= "be0c9364a0b5e997be2151213249535d8e01f194"
+SRCREV_pn-phonefsod ?= "692a5b6b8a7d2cf6af6c4bc93e97cf041b4d805c"
+SRCREV_pn-phoneui-apps ?= "d349e764400d7a4eaaa12f359d6c64b3ca55faaf"
+SRCREV_pn-phoneuid ?= "a466c58560222c6b7ab7c9554c8c5b66ed017bd7"
 SRCREV_pn-portaudio-v19 ?= "1387"
 SRCREV_pn-psplash ?= "249"
 SRCREV_pn-pty-forward-native ?= "4662b55fdba528bb5b3349f83055bf236af5d63b"
@@ -197,12 +190,17 @@ SRCREV_pn-shr-contacts ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-dialer ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-installer ?= "8608816ea1a1ac14b6e9faaa3685dd2b6450e889"
 <<<<<<< HEAD:conf/distro/include/sane-srcrevs.inc
+<<<<<<< HEAD:conf/distro/include/sane-srcrevs.inc
 SRCREV_pn-shr-launcher ?= "103"
 SRCREV_pn-shr-messages ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 =======
 >>>>>>> 67b3bae... sane-srcrevs: move SRCREVs to recipes for openmoko related svn recipes:conf/distro/include/sane-srcrevs.inc
 SRCREV_pn-shr-settings ?= "fd19508d43d8a0d990c63b329d935d2929c091dc"
 SRCREV_pn-shr-specs ?= "062fb8278132ce64eeef3e488bef068387b87aff"
+=======
+SRCREV_pn-shr-settings ?= "c0315c80f3236f1a9ddf23f38520bc88ed173ffd"
+SRCREV_pn-shr-specs ?= "d8f0dc85f1a7a6c0c6d24755f3770a55229621ae"
+>>>>>>> c240d00... shr: bump SRCREVs for SHR projects, fsogsmd, remove frameworkd-config from autorev:conf/distro/include/sane-srcrevs.inc
 SRCREV_pn-shr-splash ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-splash-theme-dontpanic ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-shr-splash-theme-handy ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
diff --git a/conf/distro/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc
index 6ae3e22..a73e213 100644
--- a/conf/distro/include/shr-autorev.inc
+++ b/conf/distro/include/shr-autorev.inc
@@ -1,10 +1,5 @@
 # SHR autorev include
-SRCREV_pn-frameworkd-config-shr = "${AUTOREV}"
-SRCREV_pn-frameworkd-config-shr_FSO_REV = "${AUTOREV}"
-SRCREV_pn-frameworkd-config-shr_SHR_REV = "${AUTOREV}"
-
 SRCREV_pn-e-wm-config-illume2-shr = "${AUTOREV}"
-SRCREV_pn-alsa-scenarii-shr = "${AUTOREV}"
 SRCREV_pn-shr-settings = "${AUTOREV}"
 SRCREV_pn-shr-specs = "${AUTOREV}"
 SRCREV_pn-phoneui-apps = "${AUTOREV}"