preferred-xorg-versions: X11 cleanup - update versions

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2083 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index e760f7ab37cb4e3861b3158a2de398b7f694886e..5eb59f62609b93c5f956b31f46fbf2fadd65dc6e 100644 (file)
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -11,9 +11,9 @@ PREFERRED_VERSION_fontcacheproto = "X11R7.0-0.1.2"
 PREFERRED_VERSION_fontcacheproto-native = "X11R7.0-0.1.2"
 PREFERRED_VERSION_fontsproto = "X11R7.0-2.0.2"
 PREFERRED_VERSION_fontsproto-native = "X11R7.0-2.0.2"
-PREFERRED_VERSION_gccmakedep = "X11R7.1-1.0.2"
+PREFERRED_VERSION_gccmakedep = "1.0.2"
 PREFERRED_VERSION_glproto = "1.4.8"
-PREFERRED_VERSION_imake = "X11R7.1-1.0.2"
+PREFERRED_VERSION_imake = "1.0.2"
 PREFERRED_VERSION_inputproto = "1.4.1"
 PREFERRED_VERSION_inputproto-native = "1.4.1"
 PREFERRED_VERSION_kbproto = "X11R7.1-1.0.3"
@@ -32,7 +32,7 @@ PREFERRED_VERSION_libx11 = "X11R7.1-1.1.1"
 PREFERRED_VERSION_libx11-native = "X11R7.1-1.0.1"
 PREFERRED_VERSION_libxau = "1.0.3"
 PREFERRED_VERSION_libxau-native = "1.0.3"
-PREFERRED_VERSION_libxaw = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxaw = "1.0.3"
 PREFERRED_VERSION_libxcomposite = "0.3.1"
 PREFERRED_VERSION_libxcursor = "1.1.8"
 PREFERRED_VERSION_libxdamage = "1.0.4"
@@ -66,9 +66,9 @@ PREFERRED_VERSION_libxvmc = "1.0.4"
 PREFERRED_VERSION_libxxf86dga = "X11R7.1-1.0.1"
 PREFERRED_VERSION_libxxf86misc = "X11R7.1-1.0.1"
 PREFERRED_VERSION_libxxf86vm = "X11R7.1-1.0.1"
-PREFERRED_VERSION_lndir = "X11R7.0-1.0.1"
-PREFERRED_VERSION_makedepend = "X11R7.0-1.0.0"
-PREFERRED_VERSION_makedepend-native = "X11R7.0-1.0.0"
+PREFERRED_VERSION_lndir = "1.0.1"
+PREFERRED_VERSION_makedepend = "1.0.0"
+PREFERRED_VERSION_makedepend-native = "1.0.0"
 PREFERRED_VERSION_printproto = "X11R7.0-1.0.3"
 PREFERRED_VERSION_randrproto = "1.2.1"
 PREFERRED_VERSION_recordproto = "X11R7.0-1.13.2"
@@ -76,8 +76,8 @@ PREFERRED_VERSION_renderproto = "X11R7.0-0.9.2"
 PREFERRED_VERSION_resourceproto = "X11R7.0-1.0.2"
 PREFERRED_VERSION_scrnsaverproto = "X11R7.1-1.1.0"
 PREFERRED_VERSION_trapproto = "X11R7.0-3.4.3"
-PREFERRED_VERSION_util-macros = "X11R7.1-1.1.5"
-PREFERRED_VERSION_util-macros-native = "X11R7.1-1.1.5"
+PREFERRED_VERSION_util-macros = "1.1.5"
+PREFERRED_VERSION_util-macros-native = "1.1.5"
 PREFERRED_VERSION_videoproto = "X11R7.0-2.2.2"
 PREFERRED_VERSION_windowswmproto = "X11R7.0-1.0.3"
 PREFERRED_VERSION_xauth = "1.0.2"
@@ -96,14 +96,14 @@ PREFERRED_VERSION_xf86vidmodeproto = "X11R7.0-2.2.2"
 PREFERRED_VERSION_xhost = "X11R7.1-1.0.1"
 PREFERRED_VERSION_xineramaproto = "X11R7.0-1.1.2"
 PREFERRED_VERSION_xmodmap = "1.0.2"
-PREFERRED_VERSION_xorg-cf-files = "X11R7.1-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 = "X11R7.0-1.0.2"
 PREFERRED_VERSION_xrandr = "1.2.0"
 PREFERRED_VERSION_xrdb = "1.0.3"
 PREFERRED_VERSION_xserver-kdrive = "1.3.0.0"
-PREFERRED_VERSION_xserver-xorg = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xserver-xorg = "1.1.0"
 PREFERRED_VERSION_xset = "X11R7.1-1.0.2"
 PREFERRED_VERSION_xtrans = "1.0.3"
 PREFERRED_VERSION_xtrans-native = "1.0.3"