merge of '09957ec14fdf3babf0d22d779c7264d24330e535'

     and 'c03b12513a0d9faea02ff87386f5cb243f7ece3e'

5 files changed, 143 insertions, 2 deletions

diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index 333c8c8bc9..dc3929c3a7 100644
--- a/conf/distro/include/angstrom-eglibc.inc
+++ b/conf/distro/include/angstrom-eglibc.inc
@@ -3,6 +3,16 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc"
 PREFERRED_PROVIDER_virtual/libintl ?= "eglibc"
 PREFERRED_PROVIDER_virtual/libc ?= "eglibc"
 
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc               = "eglibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc    = "eglibc-intermediate"
+PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc  = "eglibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc            = "eglibc-intermediate"
+PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc        = "eglibc-intermediate"
+PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc         = "eglibc-intermediate"
+PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc          = "eglibc-intermediate"
+
+
+
 TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 
 #mess with compiler flags to use -Os instead of -O2
diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc
index 940568130c..acc8498262 100644
--- a/conf/distro/include/preferred-gpe-versions-2.8.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.8.inc
@@ -24,6 +24,11 @@ PREFERRED_VERSION_libtododb ?= "0.11"
 PREFERRED_VERSION_libhandoff ?= "0.1"
 PREFERRED_VERSION_libmimedir ?= "0.4.2"
 PREFERRED_VERSION_libsoundgen ?= "0.6"
+PREFERRED_VERSION_libdotdesktop ?= "0.11"
+PREFERRED_VERSION_libeventdb ?= "0.90"
+PREFERRED_VERSION_libgpelaunch ?= "0.14"
+PREFERRED_VERSION_libgtkstylus ?= "0.3"
+PREFERRED_VERSION_libxsettings-client ?= "0.17"
 
 PREFERRED_VERSION_gpe-icons ?= "0.25"
 
@@ -33,20 +38,30 @@ PREFERRED_VERSION_gpe-su ?= "0.19"
 PREFERRED_VERSION_keylaunch ?= "2.0.10"
 PREFERRED_VERSION_startup-monitor ?= "0.18-2"
 PREFERRED_VERSION_gpe-dm ?= "0.51"
+PREFERRED_VERSION_ipaq-sleep ?= "0.9"
+PREFERRED_VERSION_teleport ?= "0.34"
+PREFERRED_VERSION_xst ?= "0.15"
 
+PREFERRED_VERSION_gpe-aerial ?= "0.3.0"
+PREFERRED_VERSION_gpe-appmgr ?= "2.8"
+PREFERRED_VERSION_gpe-autostarter ?= "0.12"
 PREFERRED_VERSION_gpe-todo ?= "0.56"
 PREFERRED_VERSION_gpe-calendar ?= "0.91"
 PREFERRED_VERSION_gpe-sketchbook ?= "0.2.9"
 PREFERRED_VERSION_gpe-contacts ?= "0.47"
 PREFERRED_VERSION_gpe-beam ?= "0.2.9" 
 PREFERRED_VERSION_gpe-bluetooth ?= "0.55"
+PREFERRED_VERSION_gpe-bootsplash ?= "1.15"
 PREFERRED_VERSION_gpe-conf ?= "0.2.6"
+PREFERRED_VERSION_gpe-confd ?= "0.16"
 PREFERRED_VERSION_gpe-clock ?= "0.25"
 PREFERRED_VERSION_gpe-mininet ?= "0.7"
 PREFERRED_VERSION_gpe-mixer ?= "0.42"
 PREFERRED_VERSION_gpe-shield ?= "0.9"
 PREFERRED_VERSION_gpe-taskmanager ?= "0.20"
 PREFERRED_VERSION_minilite ?= "0.50"
+PREFERRED_VERSION_miniclipboard ?= "0.3"
+PREFERRED_VERSION_minimix ?= "0.8"
 PREFERRED_VERSION_gpe-edit ?= "0.40"
 PREFERRED_VERSION_gpe-gallery ?= "0.97"
 PREFERRED_VERSION_gpe-calculator ?= "0.2"
@@ -64,8 +79,13 @@ PREFERRED_VERSION_gpe-announce ?= "0.13"
 PREFERRED_VERSION_gpe-timesheet ?= "0.32"
 PREFERRED_VERSION_gpe-irc ?= "0.08"
 PREFERRED_VERSION_starling ?= "0.2"
+PREFERRED_VERSION_gpe-keylock ?= "0.12"
+PREFERRED_VERSION_gpe-ownerinfo ?= "0.28"
+PREFERRED_VERSION_gpe-question ?= "0.04"
+PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
 
 PREFERRED_VERSION_gpe-go ?= "0.05"
+PREFERRED_VERSION_gpe-julia ?= "0.0.6"
 PREFERRED_VERSION_gpe-lights ?= "0.13"
 PREFERRED_VERSION_gpe-othello ?= "0.2-1"
 PREFERRED_VERSION_gpe-plucker ?= "0.4"
diff --git a/conf/distro/include/preferred-xorg-versions.inc b/conf/distro/include/preferred-xorg-versions.inc
new file mode 100644
index 0000000000..0681b01d3d
--- /dev/null
+++ b/conf/distro/include/preferred-xorg-versions.inc
@@ -0,0 +1,111 @@
+PREFERRED_VERSION_applewmproto = "1.0.3"
+PREFERRED_VERSION_bigreqsproto = "1.0.2"
+PREFERRED_VERSION_bigreqsproto-native = "1.0.2"
+PREFERRED_VERSION_compositeproto = "0.4"
+PREFERRED_VERSION_damageproto = "1.1.0"
+PREFERRED_VERSION_diet-x11 = "1.1.2"
+PREFERRED_VERSION_dmxproto = "2.2.2"
+PREFERRED_VERSION_evieext = "1.0.2"
+PREFERRED_VERSION_fixesproto = "4.0"
+PREFERRED_VERSION_fontcacheproto = "0.1.2"
+PREFERRED_VERSION_fontcacheproto-native = "0.1.2"
+PREFERRED_VERSION_fontsproto = "2.0.2"
+PREFERRED_VERSION_fontsproto-native = "2.0.2"
+PREFERRED_VERSION_gccmakedep = "1.0.2"
+PREFERRED_VERSION_glproto = "1.4.8"
+PREFERRED_VERSION_imake = "1.0.2"
+PREFERRED_VERSION_inputproto = "1.4.2"
+PREFERRED_VERSION_inputproto-native = "1.4.1"
+PREFERRED_VERSION_kbproto = "1.0.3"
+PREFERRED_VERSION_kbproto-native = "1.0.2"
+PREFERRED_VERSION_libapplewm = "1.0.0"
+PREFERRED_VERSION_libdmx = "1.0.2"
+PREFERRED_VERSION_libfontenc = "1.0.4"
+PREFERRED_VERSION_libfontenc-native = "1.0.4"
+PREFERRED_VERSION_libfs = "1.0.0"
+PREFERRED_VERSION_libice = "1.0.3"
+PREFERRED_VERSION_liblbxutil = "1.0.1"
+PREFERRED_VERSION_liboldx = "1.0.1"
+PREFERRED_VERSION_libsm = "1.0.3"
+PREFERRED_VERSION_libwindowswm = "1.0.0"
+PREFERRED_VERSION_libx11 = "1.1.2"
+PREFERRED_VERSION_libx11-native = "1.0.1"
+PREFERRED_VERSION_libxau = "1.0.3"
+PREFERRED_VERSION_libxau-native = "1.0.3"
+PREFERRED_VERSION_libxaw = "1.0.3"
+PREFERRED_VERSION_libxcomposite = "0.4.0"
+PREFERRED_VERSION_libxcursor = "1.1.8"
+PREFERRED_VERSION_libxdamage = "1.1.1"
+PREFERRED_VERSION_libxdmcp = "1.0.2"
+PREFERRED_VERSION_libxdmcp-native = "1.0.2"
+PREFERRED_VERSION_libxevie = "1.0.2"
+PREFERRED_VERSION_libxext = "1.0.3"
+PREFERRED_VERSION_libxfixes = "4.0.3"
+PREFERRED_VERSION_libxfont = "1.3.0"
+PREFERRED_VERSION_libxfont-native = "1.3.0"
+PREFERRED_VERSION_libxfontcache = "1.0.4"
+PREFERRED_VERSION_libxft = "2.1.12"
+PREFERRED_VERSION_libxi = "1.1.2"
+PREFERRED_VERSION_libxinerama = "1.0.2"
+PREFERRED_VERSION_libxkbfile = "1.0.4"
+PREFERRED_VERSION_libxkbui = "1.0.2"
+PREFERRED_VERSION_libxmu = "1.0.3"
+PREFERRED_VERSION_libxp = "1.0.0"
+PREFERRED_VERSION_libxpm = "3.5.6"
+PREFERRED_VERSION_libxprintapputil = "1.0.1"
+PREFERRED_VERSION_libxprintutil = "1.0.1"
+PREFERRED_VERSION_libxrandr = "1.2.1"
+PREFERRED_VERSION_libxrender = "0.9.2"
+PREFERRED_VERSION_libxres = "1.0.3"
+PREFERRED_VERSION_libxscrnsaver = "1.1.2"
+PREFERRED_VERSION_libxt = "1.0.5"
+PREFERRED_VERSION_libxtrap = "1.0.0"
+PREFERRED_VERSION_libxtst = "1.0.2"
+PREFERRED_VERSION_libxv = "1.0.3"
+PREFERRED_VERSION_libxvmc = "1.0.4"
+PREFERRED_VERSION_libxxf86dga = "1.0.1"
+PREFERRED_VERSION_libxxf86misc = "1.0.1"
+PREFERRED_VERSION_libxxf86vm = "1.0.1"
+PREFERRED_VERSION_lndir = "1.0.1"
+PREFERRED_VERSION_makedepend = "1.0.1"
+PREFERRED_VERSION_makedepend-native = "1.0.1"
+PREFERRED_VERSION_printproto = "1.0.3"
+PREFERRED_VERSION_randrproto = "1.2.1"
+PREFERRED_VERSION_recordproto = "1.13.2"
+PREFERRED_VERSION_renderproto = "0.9.2"
+PREFERRED_VERSION_resourceproto = "1.0.2"
+PREFERRED_VERSION_scrnsaverproto = "1.1.0"
+PREFERRED_VERSION_trapproto = "3.4.3"
+PREFERRED_VERSION_util-macros = "1.1.5"
+PREFERRED_VERSION_util-macros-native = "1.1.5"
+PREFERRED_VERSION_videoproto = "2.2.2"
+PREFERRED_VERSION_windowswmproto = "1.0.3"
+PREFERRED_VERSION_xauth = "1.0.2"
+PREFERRED_VERSION_xcmiscproto = "1.1.2"
+PREFERRED_VERSION_xcmiscproto-native = "1.1.2"
+PREFERRED_VERSION_xdpyinfo = "1.0.2"
+PREFERRED_VERSION_xextproto = "7.0.2"
+PREFERRED_VERSION_xextproto-native = "7.0.2"
+PREFERRED_VERSION_xf86bigfontproto = "1.1.2"
+PREFERRED_VERSION_xf86bigfontproto-native = "1.1.2"
+PREFERRED_VERSION_xf86dgaproto = "2.0.2"
+PREFERRED_VERSION_xf86driproto = "2.0.3"
+PREFERRED_VERSION_xf86miscproto = "0.9.2"
+PREFERRED_VERSION_xf86rushproto = "1.1.2"
+PREFERRED_VERSION_xf86vidmodeproto = "2.2.2"
+PREFERRED_VERSION_xhost = "1.0.2"
+PREFERRED_VERSION_xineramaproto = "1.1.2"
+PREFERRED_VERSION_xmodmap = "1.0.2"
+PREFERRED_VERSION_xorg-cf-files = "1.0.2"
+PREFERRED_VERSION_xproto = "7.0.10"
+PREFERRED_VERSION_xproto-native = "7.0.10"
+PREFERRED_VERSION_xproxymanagementprotocol = "1.0.2"
+PREFERRED_VERSION_xrandr = "1.2.2"
+PREFERRED_VERSION_xrdb = "1.0.3"
+PREFERRED_VERSION_xserver-kdrive = "1.3.0.0"
+PREFERRED_VERSION_xserver-xorg = "1.1.0"
+PREFERRED_VERSION_xset = "1.0.2"
+PREFERRED_VERSION_xtrans = "1.0.3"
+PREFERRED_VERSION_xtrans-native = "1.0.3"
+PREFERRED_VERSION_xinit = "1.0.4"
+PREFERRED_VERSION_xev = "1.0.2"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 18d5c07495..8310d47a22 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -95,7 +95,7 @@ SRCDATE_entice ?= "20070601"
 SRCDATE_e-utils ?= "20070601"
 SRCDATE_enna ?= "20070721"
 
-# Misc apps, sorted by alphabet
+# Misc packages, sorted by alphabet
 SRCDATE_avetanabt ?= "20060814"
 SRCDATE_bl ?= "20060814"
 SRCDATE_dvbstream ?= "20060814"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index bb1605e41b..00b9440b1f 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -16,7 +16,7 @@
 #TARGET_OS "linux" or "linux-uclibc"
 
 # The following may be overridden to make sub-versions
-SLUGOS_VERSION = "4.4"
+SLUGOS_VERSION = "4.5"
 DISTRO_REVISION ?= ""
 DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
 # For release (only):