summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/angstrom-2007.1.conf7
-rw-r--r--conf/distro/include/preferred-gpe-versions-2.8.inc2
-rw-r--r--conf/distro/include/sane-srcdates.inc2
3 files changed, 5 insertions, 6 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 0669b09f1f..b1855b0ea7 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -73,7 +73,6 @@ FEED_URIS += " \
PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh9"
PREFERRED_VERSION_linux-handhelds-2.6_h3900 = "2.6.19-hh7"
PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.18-hh1"
-PREFERRED_VERSION_linux-handhelds-2.6_magician = "2.6.19-hh7+cvs${SRCDATE}"
SRCDATE_gconf-dbus = "20060719"
@@ -108,7 +107,7 @@ PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
-PREFERRED_VERSION_gtk+ = "2.10.7"
+PREFERRED_VERSION_gtk+ = "2.10.6"
#zap extra stuff taking place in $MACHINE.conf
GPE_EXTRA_INSTALL = ""
@@ -186,7 +185,7 @@ PREFERRED_VERSION_busybox = "1.2.1"
PCMCIA_MANAGER = "pcmciautils"
PREFERRED_VERSION_dbus ?= "1.0.2"
-PREFERRED_VERSION_dbus-glib ?= "0.72"
+PREFERRED_VERSION_dbus-glib ?= "0.71"
PREFERRED_VERSION_gstreamer ?= "0.10.11"
@@ -214,7 +213,7 @@ PREFERRED_VERSION_wpa-supplicant = "0.5.5"
# We want to ship extra debug utils in the rootfs when doing a debug build
DEBUG_APPS ?= ""
-DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate gdb strace devmem2 procps",d)}'
+DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate gdb strace procps",d)}'
#this should go away soon
EXTRA_STUFF ?= ""
diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc
index 1f38c9f767..bf00aa8d01 100644
--- a/conf/distro/include/preferred-gpe-versions-2.8.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.8.inc
@@ -6,7 +6,7 @@
PREFERRED_PROVIDER_gconf="gconf-dbus"
PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus"
-#PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904"
+PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904"
# - the GPE roadmap doesn't state any versions for 2.8 yet
# http://www.handhelds.org/moin/moin.cgi/GPERoadmap
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 47df4867c9..f73fa22e34 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -45,7 +45,7 @@ SRCDATE_libmimedir ?= "20060804"
SRCDATE_gpesyncd ?= "20061128"
# GNOME
-SRCDATE_gconf-dbus ?= "20060723"
+SRCDATE_gconf-dbus ?= "20060719"
SRCDATE_gnome-vfs-dbus ?= "20060119"
SRCDATE_gtkhtml2 ?= "20060323"