diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2008-03-21 02:08:36 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2008-03-21 02:08:36 +0000 |
| commit | 00452481d1147812cfc25b6ab34c79f3d688b340 (patch) | |
| tree | ef82ddddb704632592aa208da1548e93f78c775d /conf/distro | |
| parent | 46858d01adf23692e92e456b0d2f8f2f9fe4be45 (diff) | |
| parent | ed30a7771141cc26adb8e9b38a06d4237f287b96 (diff) | |
merge of '5835e96816cbf14d4a7298959b92309cd3d8178b'
and 'f7df80732af56b59315ef203e69f092313ec2ddd'
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 1 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-2008-preferred-versions.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 7d69484e91..a78469c3d1 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -81,7 +81,6 @@ PREFERRED_VERSION_uclibc-initial ?= "0.9.29" #Prefer a newer GTK+ and friends PREFERRED_VERSION_gtk+ ?= "2.12.3" PREFERRED_VERSION_glib-2.0 ?= "2.14.4" -PREFERRED_VERSION_pango ?= "1.18.1" PREFERRED_PROVIDER_avahi = "avahi" diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 912bb72c7d..e326118a1a 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -3,6 +3,6 @@ PREFERRED_VERSION_dbus = "1.1.20" PREFERRED_VERSION_glib-2.0 = "2.16.1" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_libtool = "1.5.10" +PREFERRED_VERSION_pango = "1.18.3" PREFERRED_VERSION_pulseaudio = "0.9.9" PREFERRED_VERSION_udev = "118" -PREFERRED_VERSION_vte = "0.16.10" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index e871e92473..60d35f2bdb 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -137,9 +137,9 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "3767" SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "517" SRCREV_pn-openocd-native ?= "517" -SRCREV_pn-opkg ?= "4210" -SRCREV_pn-opkg-native ?= "4210" -SRCREV_pn-opkg-sdk ?= "4209" +SRCREV_pn-opkg ?= "4235" +SRCREV_pn-opkg-native ?= "4235" +SRCREV_pn-opkg-sdk ?= "4235" SRCREV_pn-oprofileui ?= "160" SRCREV_pn-psplash ?= "249" SRCREV_pn-pty-forward-native ?= "4214" |