[oe-commits] Thomas Zimmermann : preferred-xorg-versions: correct xorg-server to xserver-xorg and remove entry from shr-om-gta02. conf

[git version control]

Module: openembedded.git
Branch: shr/import
Commit: c89c8ad99bf8371b4a2e1ef3d81d3859fae0e388
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c89c8ad99bf8371b4a2e1ef3d81d3859fae0e388

Author: Thomas Zimmermann <zimmermann at vdm-design.de>
Date:   Sun Sep 20 08:03:15 2009 +0000

preferred-xorg-versions: correct xorg-server to xserver-xorg and remove entry from shr-om-gta02.conf

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 .../include/preferred-xorg-versions-live.inc       |    4 ++--
 conf/distro/include/shr-om-gta02-xorg.conf         |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc
index b60fd9b..e6f17b2 100644
--- a/conf/distro/include/preferred-xorg-versions-live.inc
+++ b/conf/distro/include/preferred-xorg-versions-live.inc
@@ -633,5 +633,5 @@ PREFERRED_VERSION_util-macros ?= "1.3.0"
 PREFERRED_VERSION_util-macros-native ?= "1.3.0"
 PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
 PREFERRED_VERSION_xorg-cf-files-native ?= "1.0.2"
-PREFERRED_VERSION_xorg-server ?= "1.6.99.901"
-PREFERRED_VERSION_xorg-server-native ?= "1.6.99.901"
+PREFERRED_VERSION_xserver-xorg ?= "1.6.99.901"
+PREFERRED_VERSION_xserver-xorg-native ?= "1.6.99.901"
diff --git a/conf/distro/include/shr-om-gta02-xorg.conf b/conf/distro/include/shr-om-gta02-xorg.conf
index ef89880..5367ada 100644
--- a/conf/distro/include/shr-om-gta02-xorg.conf
+++ b/conf/distro/include/shr-om-gta02-xorg.conf
@@ -5,7 +5,6 @@ PREFERRED_PROVIDER_xf86-video-glamo = "xf86-video-glamo"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 PREFERRED_PROVIDER_drm = "libdrm"
 PREFERRED_PROVIDER_mesa = "mesa"
-PREFERRED_VERSION_xserver-xorg = "1.6.999+git%"
 XSERVER = "xserver-xorg"
 SRCREV_pn-xf86-video-glamo = "${AUTOREV}"
 SRCREV_pn-xf86-input-mouse = "${AUTOREV}"