diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-09-28 10:47:03 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-09-28 10:47:03 +0200 |
| commit | ae406036fed38040f406d4408c6bbb77cb25f831 (patch) | |
| tree | da0919a90c80a23f458868fa7b52877660336a93 /conf/distro | |
| parent | 05f0d6768a22488d8ad89c3cee63b8b994e0f75f (diff) | |
| parent | de576627a2b56ce347f7b58d0a784b9bd045b66a (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/include/angstrom-2008-preferred-versions.inc | 6 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 0c0c83117e..03e5c8ec23 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -6,12 +6,12 @@ PREFERRED_VERSION_cairo = "1.8.0" PREFERRED_VERSION_dbus = "1.2.1" PREFERRED_VERSION_dropbear = "0.51" PREFERRED_VERSION_fontconfig = "2.6.0" -PREFERRED_VERSION_glib-2.0 = "2.21.4" -PREFERRED_VERSION_glib-2.0-native = "2.18.0" +PREFERRED_VERSION_glib-2.0 = "2.22.0" +PREFERRED_VERSION_glib-2.0-native = "2.22.0" PREFERRED_VERSION_glibmm = "2.18.0" PREFERRED_VERSION_glproto = "1.4.9" PREFERRED_VERSION_gst-pulse = "0.9.7" -PREFERRED_VERSION_gtk+ = "2.16.6" +PREFERRED_VERSION_gtk+ = "2.18.0" PREFERRED_VERSION_gtkmm = "2.14.1" PREFERRED_VERSION_hal = "0.5.13" PREFERRED_VERSION_libgemwidget = "1.0" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 956e1fbe22..ce6e4bceb1 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -115,18 +115,20 @@ SRCREV_pn-madbutterfly ?= "ecd1842714b5e982f3138cbdd358517d57be6aa3" SRCREV_pn-maemo-mapper ?= "118" SRCREV_pn-mamonaim_e_applet ?= "51c747849f71981bd1dc9eb1807df4993ad97d04" SRCREV_pn-mamona_input_methods ?= "7e6a8cc947689a045d0fba90015da599275347d9" -SRCREV_pn-matchbox-desktop-2 ?= "1778" +SRCREV_pn-matchbox-desktop-2 ?= "2096" SRCREV_pn-matchbox-keyboard ?= "1910" SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910" -SRCREV_pn-matchbox-panel-2 ?= "1626" +SRCREV_pn-matchbox-panel-2 ?= "2098" +SRCREV_pn-matchbox-panel-2-icon-themes ?= "1907" SRCREV_pn-matchbox-stroke ?= "1820" SRCREV_pn-matchbox-terminal ?= "1612" +SRCREV_pn-matchbox-wm-2 ?= "2087" SRCREV_pn-midori ?= "400139644371c0b675723f9a986ddab4445a8794" SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce" SRCREV_pn-moko-gtk-engine ?= "4734" SRCREV_pn-mokoko ?= "127" SRCREV_pn-mpd-alsa ?= "6952" -SRCREV_pn-mplayer ?= "29653" +SRCREV_pn-mplayer ?= "29716" SRCREV_pn-mplayer-maemo ?= "342" SRCREV_pn-multicat ?= "f894801916cc4d0e912e4553490dc215276c52a9" SRCREV_pn-multitap-pad ?= "373" @@ -246,7 +248,7 @@ SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "41533" +EFL_SRCREV ?= "42645" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eina-native ?= "${EFL_SRCREV}" |