diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-10-01 12:33:20 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-10-01 12:33:20 +0000 |
| commit | c6a46d9fc00dccc78b3543ee6c5b62f856bc4c86 (patch) | |
| tree | fa46636f8c4430d89af0ff3559a98d42345bd07c /conf | |
| parent | 5aaaaa5942b4a928a34bf3804a3cf8cc302be4f8 (diff) | |
| parent | 0758358b14b63d166784e5163682f9dc72b49a0e (diff) | |
merge of 'e7fcaa386e6ece8257005e7222964138b4ee8773'
and 'f68cd62e66ec1f6d24dc3d4588abbc23993878da'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 2 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 9b3c3fed11..3b14fd82a9 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -312,7 +312,7 @@ PREFERRED_VERSION_glibc-initial ?= "2.5" PREFERRED_VERSION_busybox = "1.2.1" PREFERRED_VERSION_dbus ?= "1.0.2" -PREFERRED_VERSION_dbus-glib ?= "0.72" +PREFERRED_VERSION_dbus-glib ?= "0.74" PREFERRED_VERSION_wpa-supplicant = "0.5.5" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 2d4fd0f82b..e3efa9f699 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -33,7 +33,7 @@ SRCREV_pn-matchbox-desktop-2 ?= "1649" SRCREV_pn-matchbox-keyboard ?= "1675" SRCREV_pn-matchbox-keyboard-inputmethod ?= "1675" SRCREV_pn-matchbox-panel-2 ?= "1626" -SRCREV_moko-gtk-engine ?= "3029" +SRCREV_pn-moko-gtk-engine ?= "3058" SRCREV_pn-neod ?= "2956" SRCREV_pn-oh-puzzles ?= "22" SRCREV_pn-osb-browser ?= "125" @@ -41,7 +41,7 @@ SRCREV_pn-osb-jscore ?= "117" SRCREV_pn-osb-nrcit ?= "125" SRCREV_pn-osb-nrcore ?= "126" SRCREV_pn-openmoko-appmanager ?= "1851" -SRCREV_pn-openmoko-browser2 ?= "3031" +SRCREV_pn-openmoko-browser2 ?= "3061" SRCREV_pn-openmoko-calculator ?= "2404" SRCREV_pn-openmoko-calculator2 ?= "2789" SRCREV_pn-openmoko-common ?= "397" @@ -52,12 +52,12 @@ SRCREV_pn-openmoko-dates ?= "467" SRCREV_pn-openmoko-dates2 ?= "563" SRCREV_pn-openmoko-dialer ?= "2811" SRCREV_pn-openmoko-dialer2 ?= "2976" -SRCREV_pn-openmoko-feedreader2 ?= "2944" +SRCREV_pn-openmoko-feedreader2 ?= "3060" SRCREV_pn-openmoko-finger-demo ?= "1671" SRCREV_pn-openmoko-firststart2 ?= "2873" SRCREV_pn-openmoko-footer ?= "2354" SRCREV_pn-openmoko-icon-theme-standard ?= "2232" -SRCREV_pn-openmoko-icon-theme-standard2 ?= "2967" +SRCREV_pn-openmoko-icon-theme-standard2 ?= "3055" SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "2967" SRCREV_pn-openmoko-keyboard ?= "1631" SRCREV_pn-openmoko-libs ?= "2367" @@ -85,7 +85,7 @@ SRCREV_pn-openmoko-theme-standard ?= "2370" SRCREV_pn-openmoko-theme-standard-qvga ?= "2370" SRCREV_pn-openmoko-theme-standard2 ?= "2964" SRCREV_pn-openmoko-theme-standard2-qvga ?= "2964" -SRCREV_pn-openmoko-today ?= "2556" +SRCREV_pn-openmoko-today ?= "3056" SRCREV_pn-openmoko-today2 ?= "2955" SRCREV_pn-openmoko-today2-folders ?= "2680" SRCREV_pn-openocd ?= "206" @@ -94,7 +94,9 @@ SRCREV_pn-psplash ?= "249" SRCREV_pn-settings-daemon ?= "1615" SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "44" -SRCREV_pn-webkit-gtk ?= "25615" +SRCREV_pn-webkit-gtk ?= "25808" SRCREV_pn-xoo ?= "1623" SRCREV_pn-mplayer ?= "24587" +SRCREV_pn-networkmanager ?= "2887" +SRCREV_pn-networkmanager-applet ?= "200" |