summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-02-27 22:05:11 +0000
committerRichard Purdie <richard@openedhand.com>2007-02-27 22:05:11 +0000
commit7b7b47957d41e75d51fe9c8bd47d970b6ca8f7c1 (patch)
tree7ebebde2b543c829f53d64094691c56ce0ac35c2 /meta
parentb10bd12a91722b60d63c310561279372e6871fa1 (diff)
downloadpoky-7b7b47957d41e75d51fe9c8bd47d970b6ca8f7c1.tar.gz
Various version cleanups
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1297 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc10
-rw-r--r--meta/conf/distro/poky.conf23
2 files changed, 10 insertions, 23 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 1a28a3f3b4..8ff64dbbed 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -3,7 +3,7 @@ PREFERRED_VERSION_bigreqsproto = "X11R7.0-1.0.2"
3PREFERRED_VERSION_bigreqsproto-native = "X11R7.0-1.0.2" 3PREFERRED_VERSION_bigreqsproto-native = "X11R7.0-1.0.2"
4PREFERRED_VERSION_compositeproto = "X11R7.1-0.3.1" 4PREFERRED_VERSION_compositeproto = "X11R7.1-0.3.1"
5PREFERRED_VERSION_damageproto = "X11R7.0-1.0.3" 5PREFERRED_VERSION_damageproto = "X11R7.0-1.0.3"
6PREFERRED_VERSION_diet-x11 = "X11R7.1-1.0.1" 6PREFERRED_VERSION_diet-x11 = "X11R7.1-1.1.1"
7PREFERRED_VERSION_dmxproto = "X11R7.0-2.2.2" 7PREFERRED_VERSION_dmxproto = "X11R7.0-2.2.2"
8PREFERRED_VERSION_evieext = "X11R7.0-1.0.2" 8PREFERRED_VERSION_evieext = "X11R7.0-1.0.2"
9PREFERRED_VERSION_fixesproto = "X11R7.1-4.0" 9PREFERRED_VERSION_fixesproto = "X11R7.1-4.0"
@@ -14,7 +14,7 @@ PREFERRED_VERSION_fontsproto-native = "X11R7.0-2.0.2"
14PREFERRED_VERSION_gccmakedep = "X11R7.1-1.0.2" 14PREFERRED_VERSION_gccmakedep = "X11R7.1-1.0.2"
15PREFERRED_VERSION_glproto = "X11R7.1-1.4.7" 15PREFERRED_VERSION_glproto = "X11R7.1-1.4.7"
16PREFERRED_VERSION_imake = "X11R7.1-1.0.2" 16PREFERRED_VERSION_imake = "X11R7.1-1.0.2"
17PREFERRED_VERSION_inputproto = "X11R7.0-1.3.2" 17PREFERRED_VERSION_inputproto = "X11R7.1-1.4"
18PREFERRED_VERSION_inputproto-native = "X11R7.0-1.3.2" 18PREFERRED_VERSION_inputproto-native = "X11R7.0-1.3.2"
19PREFERRED_VERSION_kbproto = "X11R7.1-1.0.3" 19PREFERRED_VERSION_kbproto = "X11R7.1-1.0.3"
20PREFERRED_VERSION_kbproto-native = "X11R7.0-1.0.2" 20PREFERRED_VERSION_kbproto-native = "X11R7.0-1.0.2"
@@ -28,7 +28,7 @@ PREFERRED_VERSION_liblbxutil = "X11R7.1-1.0.1"
28PREFERRED_VERSION_liboldx = "X11R7.0-1.0.1" 28PREFERRED_VERSION_liboldx = "X11R7.0-1.0.1"
29PREFERRED_VERSION_libsm = "X11R7.1-1.0.1" 29PREFERRED_VERSION_libsm = "X11R7.1-1.0.1"
30PREFERRED_VERSION_libwindowswm = "X11R7.0-1.0.0" 30PREFERRED_VERSION_libwindowswm = "X11R7.0-1.0.0"
31PREFERRED_VERSION_libx11 = "X11R7.1-1.0.1" 31PREFERRED_VERSION_libx11 = "X11R7.1-1.1.1"
32PREFERRED_VERSION_libx11-native = "X11R7.1-1.0.1" 32PREFERRED_VERSION_libx11-native = "X11R7.1-1.0.1"
33PREFERRED_VERSION_libxau = "X11R7.1-1.0.1" 33PREFERRED_VERSION_libxau = "X11R7.1-1.0.1"
34PREFERRED_VERSION_libxau-native = "X11R7.1-1.0.1" 34PREFERRED_VERSION_libxau-native = "X11R7.1-1.0.1"
@@ -76,7 +76,7 @@ PREFERRED_VERSION_renderproto = "X11R7.0-0.9.2"
76PREFERRED_VERSION_resourceproto = "X11R7.0-1.0.2" 76PREFERRED_VERSION_resourceproto = "X11R7.0-1.0.2"
77PREFERRED_VERSION_scrnsaverproto = "X11R7.1-1.1.0" 77PREFERRED_VERSION_scrnsaverproto = "X11R7.1-1.1.0"
78PREFERRED_VERSION_trapproto = "X11R7.0-3.4.3" 78PREFERRED_VERSION_trapproto = "X11R7.0-3.4.3"
79PREFERRED_VERSION_util-macros = "X11R7.1-1.0.2" 79PREFERRED_VERSION_util-macros = "X11R7.1-1.1.5"
80PREFERRED_VERSION_util-macros-native = "X11R7.1-1.0.2" 80PREFERRED_VERSION_util-macros-native = "X11R7.1-1.0.2"
81PREFERRED_VERSION_videoproto = "X11R7.0-2.2.2" 81PREFERRED_VERSION_videoproto = "X11R7.0-2.2.2"
82PREFERRED_VERSION_windowswmproto = "X11R7.0-1.0.3" 82PREFERRED_VERSION_windowswmproto = "X11R7.0-1.0.3"
@@ -97,7 +97,7 @@ PREFERRED_VERSION_xhost = "X11R7.1-1.0.1"
97PREFERRED_VERSION_xineramaproto = "X11R7.0-1.1.2" 97PREFERRED_VERSION_xineramaproto = "X11R7.0-1.1.2"
98PREFERRED_VERSION_xmodmap = "X11R7.1-1.0.1" 98PREFERRED_VERSION_xmodmap = "X11R7.1-1.0.1"
99PREFERRED_VERSION_xorg-cf-files = "X11R7.1-1.0.2" 99PREFERRED_VERSION_xorg-cf-files = "X11R7.1-1.0.2"
100PREFERRED_VERSION_xproto = "X11R7.1-7.0.5" 100PREFERRED_VERSION_xproto = "X11R7.1-7.0.8"
101PREFERRED_VERSION_xproto-native = "X11R7.1-7.0.5" 101PREFERRED_VERSION_xproto-native = "X11R7.1-7.0.5"
102PREFERRED_VERSION_xproxymanagementprotocol = "X11R7.0-1.0.2" 102PREFERRED_VERSION_xproxymanagementprotocol = "X11R7.0-1.0.2"
103PREFERRED_VERSION_xrandr = "X11R7.1-1.0.2" 103PREFERRED_VERSION_xrandr = "X11R7.1-1.0.2"
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index cc775022d0..d8e479f8c4 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -57,10 +57,11 @@ PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
57PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive 57PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive
58PREFERRED_PROVIDER_virtual/update-alternatives ?= update-alternatives-cworth 58PREFERRED_PROVIDER_virtual/update-alternatives ?= update-alternatives-cworth
59PREFERRED_PROVIDER_virtual/update-alternatives-native ?= update-alternatives-cworth-native 59PREFERRED_PROVIDER_virtual/update-alternatives-native ?= update-alternatives-cworth-native
60PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
60 61
61# Others: 62# Others:
62PREFERRED_PROVIDER_libx11 ?= "diet-x11"
63PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib" 63PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
64PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
64PREFERRED_PROVIDER_gconf ?= "gconf-dbus" 65PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
65PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs" 66PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
66PREFERRED_PROVIDER_tslib ?= "tslib" 67PREFERRED_PROVIDER_tslib ?= "tslib"
@@ -96,34 +97,20 @@ SRCDATE_matchbox-wm ?= "20061223"
96SRCDATE_libmatchbox ?= "20060729" 97SRCDATE_libmatchbox ?= "20060729"
97SRCDATE_settings-daemon ?= "20070104" 98SRCDATE_settings-daemon ?= "20070104"
98SRCDATE_screenshot ?= "20070125" 99SRCDATE_screenshot ?= "20070125"
99SRCDATE_tslib ?= "20051101"
100SRCDATE_libxext ?= "20051101"
101SRCDATE_renderext ?= "20051101"
102SRCDATE_libxrender ?= "20051101"
103SRCDATE_fixesext ?= "20051101"
104SRCDATE_damageext ?= "20051101"
105SRCDATE_compositeext ?= "20051101"
106SRCDATE_xcalibrateext ?= "20051101" 100SRCDATE_xcalibrateext ?= "20051101"
107SRCDATE_recordext ?= "20051101"
108SRCDATE_libfakekey ?= "20051101" 101SRCDATE_libfakekey ?= "20051101"
109SRCDATE_xmodmap ?= "20051101"
110SRCDATE_libxrandr ?= "20051101"
111SRCDATE_libxtst ?= "20051101"
112SRCDATE_xcalibrate ?= "20060312" 102SRCDATE_xcalibrate ?= "20060312"
113SRCDATE_libxmu ?= "20051115"
114SRCDATE_xdpyinfo ?= "20051115"
115SRCDATE_xauth ?= "20060120"
116SRCDATE_xserver-kdrive = "20050207"
117SRCDATE_qemu ?= "20060723" 103SRCDATE_qemu ?= "20060723"
118SRCDATE_qemu-native ?= "20060723" 104SRCDATE_qemu-native ?= "20060723"
119SRCDATE_oprofile ?= "20070106" 105SRCDATE_oprofile ?= "20070106"
120SRCDATE_zaurusd ?= "20060729" 106SRCDATE_zaurusd ?= "20070201"
121SRCDATE_owl-video-widget ?= "20060925" 107SRCDATE_owl-video-widget ?= "20070201"
122SRCDATE_psplash ?= "20061223" 108SRCDATE_psplash ?= "20061223"
123SRCDATE_maemo-mapper-nohildon ?= "20061114" 109SRCDATE_maemo-mapper-nohildon ?= "20061114"
124SRCDATE_exmap-console = "20061220" 110SRCDATE_exmap-console = "20061220"
125SRCDATE_gtk-sato-engine = "20070203" 111SRCDATE_gtk-sato-engine = "20070203"
126SRCDATE_matchbox-theme-sato = "20061225" 112SRCDATE_matchbox-theme-sato = "20061225"
113SRCDATE_tasks = "20070228"
127SRCDATE_sato-icon-theme = "20070227" 114SRCDATE_sato-icon-theme = "20070227"
128 115
129# 116#
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 22:56:26 +0000