2 files changed, 114 insertions, 6 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
new file mode 100644
index 0000000000..1a28a3f3b4
--- /dev/null
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -0,0 +1,109 @@
+PREFERRED_VERSION_applewmproto = "X11R7.0-1.0.3"
+PREFERRED_VERSION_bigreqsproto = "X11R7.0-1.0.2"
+PREFERRED_VERSION_bigreqsproto-native = "X11R7.0-1.0.2"
+PREFERRED_VERSION_compositeproto = "X11R7.1-0.3.1"
+PREFERRED_VERSION_damageproto = "X11R7.0-1.0.3"
+PREFERRED_VERSION_diet-x11 = "X11R7.1-1.0.1"
+PREFERRED_VERSION_dmxproto = "X11R7.0-2.2.2"
+PREFERRED_VERSION_evieext = "X11R7.0-1.0.2"
+PREFERRED_VERSION_fixesproto = "X11R7.1-4.0"
+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_glproto = "X11R7.1-1.4.7"
+PREFERRED_VERSION_imake = "X11R7.1-1.0.2"
+PREFERRED_VERSION_inputproto = "X11R7.0-1.3.2"
+PREFERRED_VERSION_inputproto-native = "X11R7.0-1.3.2"
+PREFERRED_VERSION_kbproto = "X11R7.1-1.0.3"
+PREFERRED_VERSION_kbproto-native = "X11R7.0-1.0.2"
+PREFERRED_VERSION_libapplewm = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libdmx = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libfontenc = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libfontenc-native = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libfs = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libice = "X11R7.1-1.0.1"
+PREFERRED_VERSION_liblbxutil = "X11R7.1-1.0.1"
+PREFERRED_VERSION_liboldx = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libsm = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libwindowswm = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libx11 = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libx11-native = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxau = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxau-native = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxaw = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxcomposite = "X11R7.1-0.3"
+PREFERRED_VERSION_libxcursor = "X11R7.1-1.1.6"
+PREFERRED_VERSION_libxdamage = "X11R7.1-1.0.3"
+PREFERRED_VERSION_libxdmcp = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxdmcp-native = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxevie = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxext = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxfixes = "X11R7.1-4.0.1"
+PREFERRED_VERSION_libxfont = "X11R7.1-1.2.0"
+PREFERRED_VERSION_libxfont-native = "X11R7.1-1.1.0"
+PREFERRED_VERSION_libxfontcache = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxft = "X11R7.0-2.1.8.2"
+PREFERRED_VERSION_libxi = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxinerama = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxkbfile = "X11R7.1-1.0.3"
+PREFERRED_VERSION_libxkbui = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxmu = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxp = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxpm = "X11R7.1-3.5.5"
+PREFERRED_VERSION_libxprintapputil = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxprintutil = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxrandr = "X11R7.1-1.1.1"
+PREFERRED_VERSION_libxrender = "X11R7.1-0.9.1"
+PREFERRED_VERSION_libxres = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxscrnsaver = "X11R7.1-1.1.0"
+PREFERRED_VERSION_libxt = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxtrap = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxtst = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxv = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxvmc = "X11R7.1-1.0.2"
+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_printproto = "X11R7.0-1.0.3"
+PREFERRED_VERSION_randrproto = "X11R7.0-1.1.2"
+PREFERRED_VERSION_recordproto = "X11R7.0-1.13.2"
+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.0.2"
+PREFERRED_VERSION_util-macros-native = "X11R7.1-1.0.2"
+PREFERRED_VERSION_videoproto = "X11R7.0-2.2.2"
+PREFERRED_VERSION_windowswmproto = "X11R7.0-1.0.3"
+PREFERRED_VERSION_xauth = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xcmiscproto = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xcmiscproto-native = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xdpyinfo = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xextproto = "X11R7.0-7.0.2"
+PREFERRED_VERSION_xextproto-native = "X11R7.0-7.0.2"
+PREFERRED_VERSION_xf86bigfontproto = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xf86bigfontproto-native = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xf86dgaproto = "X11R7.0-2.0.2"
+PREFERRED_VERSION_xf86driproto = "X11R7.0-2.0.3"
+PREFERRED_VERSION_xf86miscproto = "X11R7.0-0.9.2"
+PREFERRED_VERSION_xf86rushproto = "X11R7.0-1.1.2"
+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 = "X11R7.1-1.0.1"
+PREFERRED_VERSION_xorg-cf-files = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xproto = "X11R7.1-7.0.5"
+PREFERRED_VERSION_xproto-native = "X11R7.1-7.0.5"
+PREFERRED_VERSION_xproxymanagementprotocol = "X11R7.0-1.0.2"
+PREFERRED_VERSION_xrandr = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xrdb = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xserver-xorg = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xset = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xtrans = "X11R7.0-1.0.0"
+PREFERRED_VERSION_xtrans-native = "X11R7.0-1.0.0"
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index a08abf134c..561effbe29 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -103,7 +103,7 @@ SRCDATE_libfakekey ?= "20051101"
 SRCDATE_xmodmap ?= "20051101"
 SRCDATE_libxrandr ?= "20051101"
 SRCDATE_libxtst ?= "20051101"
-SRCDATE_xcalibrate ?= "20051101"
+SRCDATE_xcalibrate ?= "20060312"
 SRCDATE_libxmu ?= "20051115"
 SRCDATE_xdpyinfo ?= "20051115"
 SRCDATE_xauth ?= "20060120"
@@ -127,7 +127,6 @@ PREFERRED_VERSION_matchbox-stroke ?= "0.0+svn${SRCDATE}"
 PREFERRED_VERSION_matchbox-themes-extra ?= "0.3+svn${SRCDATE}"
 PREFERRED_VERSION_matchbox-wm ?= "1.1"
 PREFERRED_VERSION_libmatchbox ?= "1.9"
-PREFERRED_VERSION_xserver-kdrive = "0.0+cvs${SRCDATE}"
 PREFERRED_VERSION_glib-2.0 ?= "2.10.3"
 PREFERRED_VERSION_glib-2.0-native ?= "2.10.3"
@@ -140,7 +139,6 @@ PREFERRED_VERSION_pango ?= "1.10.1"
 PREFERRED_VERSION_dbus ?= "0.60"
 PREFERRED_VERSION_gnome-vfs-dbus ?= "2.12.0+cvs${SRCDATE}"
-PREFERRED_VERSION_diet-x11 ?= "6.2.1"
 PREFERRED_VERSION_dillo2 ?= "0.6.6"
 PREFERRED_VERSION_evince ?= "0.3.2"
 PREFERRED_VERSION_firefox ?= "1.0"
@@ -161,14 +159,15 @@ PREFERRED_VERSION_rxvt-unicode ?= "5.6"
 PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
 PREFERRED_VERSION_xdemineur ?= "2.1.1"
 PREFERRED_VERSION_xextensions ?= "1.0.1"
-PREFERRED_VERSION_xhost ?= "0.0+cvs20040413"
 PREFERRED_VERSION_xmonobut ?= "0.4"
 PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" 
-PREFERRED_VERSION_xproto ?= "6.6.2"
-PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
 PREFERRED_VERSION_xst ?= "0.15"
 PREFERRED_VERSION_oprofile ?= "0.9.1+cvs${SRCDATE}"
+require conf/distro/include/preferred-xorg-versions.inc
 PCMCIA_MANAGER ?= "pcmciautils"
 CVS_TARBALL_STASH += "http://www.o-hand.com/~richard/poky/sources/"

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc new file mode 100644 index 0000000000..1a28a3f3b4 --- /dev/null +++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -0,0 +1,109 @@
		1	PREFERRED_VERSION_applewmproto = "X11R7.0-1.0.3"
		2	PREFERRED_VERSION_bigreqsproto = "X11R7.0-1.0.2"
		3	PREFERRED_VERSION_bigreqsproto-native = "X11R7.0-1.0.2"
		4	PREFERRED_VERSION_compositeproto = "X11R7.1-0.3.1"
		5	PREFERRED_VERSION_damageproto = "X11R7.0-1.0.3"
		6	PREFERRED_VERSION_diet-x11 = "X11R7.1-1.0.1"
		7	PREFERRED_VERSION_dmxproto = "X11R7.0-2.2.2"
		8	PREFERRED_VERSION_evieext = "X11R7.0-1.0.2"
		9	PREFERRED_VERSION_fixesproto = "X11R7.1-4.0"
		10	PREFERRED_VERSION_fontcacheproto = "X11R7.0-0.1.2"
		11	PREFERRED_VERSION_fontcacheproto-native = "X11R7.0-0.1.2"
		12	PREFERRED_VERSION_fontsproto = "X11R7.0-2.0.2"
		13	PREFERRED_VERSION_fontsproto-native = "X11R7.0-2.0.2"
		14	PREFERRED_VERSION_gccmakedep = "X11R7.1-1.0.2"
		15	PREFERRED_VERSION_glproto = "X11R7.1-1.4.7"
		16	PREFERRED_VERSION_imake = "X11R7.1-1.0.2"
		17	PREFERRED_VERSION_inputproto = "X11R7.0-1.3.2"
		18	PREFERRED_VERSION_inputproto-native = "X11R7.0-1.3.2"
		19	PREFERRED_VERSION_kbproto = "X11R7.1-1.0.3"
		20	PREFERRED_VERSION_kbproto-native = "X11R7.0-1.0.2"
		21	PREFERRED_VERSION_libapplewm = "X11R7.0-1.0.0"
		22	PREFERRED_VERSION_libdmx = "X11R7.1-1.0.2"
		23	PREFERRED_VERSION_libfontenc = "X11R7.1-1.0.2"
		24	PREFERRED_VERSION_libfontenc-native = "X11R7.1-1.0.2"
		25	PREFERRED_VERSION_libfs = "X11R7.0-1.0.0"
		26	PREFERRED_VERSION_libice = "X11R7.1-1.0.1"
		27	PREFERRED_VERSION_liblbxutil = "X11R7.1-1.0.1"
		28	PREFERRED_VERSION_liboldx = "X11R7.0-1.0.1"
		29	PREFERRED_VERSION_libsm = "X11R7.1-1.0.1"
		30	PREFERRED_VERSION_libwindowswm = "X11R7.0-1.0.0"
		31	PREFERRED_VERSION_libx11 = "X11R7.1-1.0.1"
		32	PREFERRED_VERSION_libx11-native = "X11R7.1-1.0.1"
		33	PREFERRED_VERSION_libxau = "X11R7.1-1.0.1"
		34	PREFERRED_VERSION_libxau-native = "X11R7.1-1.0.1"
		35	PREFERRED_VERSION_libxaw = "X11R7.1-1.0.2"
		36	PREFERRED_VERSION_libxcomposite = "X11R7.1-0.3"
		37	PREFERRED_VERSION_libxcursor = "X11R7.1-1.1.6"
		38	PREFERRED_VERSION_libxdamage = "X11R7.1-1.0.3"
		39	PREFERRED_VERSION_libxdmcp = "X11R7.1-1.0.1"
		40	PREFERRED_VERSION_libxdmcp-native = "X11R7.1-1.0.1"
		41	PREFERRED_VERSION_libxevie = "X11R7.1-1.0.1"
		42	PREFERRED_VERSION_libxext = "X11R7.1-1.0.1"
		43	PREFERRED_VERSION_libxfixes = "X11R7.1-4.0.1"
		44	PREFERRED_VERSION_libxfont = "X11R7.1-1.2.0"
		45	PREFERRED_VERSION_libxfont-native = "X11R7.1-1.1.0"
		46	PREFERRED_VERSION_libxfontcache = "X11R7.1-1.0.2"
		47	PREFERRED_VERSION_libxft = "X11R7.0-2.1.8.2"
		48	PREFERRED_VERSION_libxi = "X11R7.1-1.0.1"
		49	PREFERRED_VERSION_libxinerama = "X11R7.0-1.0.1"
		50	PREFERRED_VERSION_libxkbfile = "X11R7.1-1.0.3"
		51	PREFERRED_VERSION_libxkbui = "X11R7.1-1.0.2"
		52	PREFERRED_VERSION_libxmu = "X11R7.1-1.0.1"
		53	PREFERRED_VERSION_libxp = "X11R7.0-1.0.0"
		54	PREFERRED_VERSION_libxpm = "X11R7.1-3.5.5"
		55	PREFERRED_VERSION_libxprintapputil = "X11R7.0-1.0.1"
		56	PREFERRED_VERSION_libxprintutil = "X11R7.0-1.0.1"
		57	PREFERRED_VERSION_libxrandr = "X11R7.1-1.1.1"
		58	PREFERRED_VERSION_libxrender = "X11R7.1-0.9.1"
		59	PREFERRED_VERSION_libxres = "X11R7.1-1.0.1"
		60	PREFERRED_VERSION_libxscrnsaver = "X11R7.1-1.1.0"
		61	PREFERRED_VERSION_libxt = "X11R7.1-1.0.2"
		62	PREFERRED_VERSION_libxtrap = "X11R7.0-1.0.0"
		63	PREFERRED_VERSION_libxtst = "X11R7.0-1.0.1"
		64	PREFERRED_VERSION_libxv = "X11R7.0-1.0.1"
		65	PREFERRED_VERSION_libxvmc = "X11R7.1-1.0.2"
		66	PREFERRED_VERSION_libxxf86dga = "X11R7.1-1.0.1"
		67	PREFERRED_VERSION_libxxf86misc = "X11R7.1-1.0.1"
		68	PREFERRED_VERSION_libxxf86vm = "X11R7.1-1.0.1"
		69	PREFERRED_VERSION_lndir = "X11R7.0-1.0.1"
		70	PREFERRED_VERSION_makedepend = "X11R7.0-1.0.0"
		71	PREFERRED_VERSION_makedepend-native = "X11R7.0-1.0.0"
		72	PREFERRED_VERSION_printproto = "X11R7.0-1.0.3"
		73	PREFERRED_VERSION_randrproto = "X11R7.0-1.1.2"
		74	PREFERRED_VERSION_recordproto = "X11R7.0-1.13.2"
		75	PREFERRED_VERSION_renderproto = "X11R7.0-0.9.2"
		76	PREFERRED_VERSION_resourceproto = "X11R7.0-1.0.2"
		77	PREFERRED_VERSION_scrnsaverproto = "X11R7.1-1.1.0"
		78	PREFERRED_VERSION_trapproto = "X11R7.0-3.4.3"
		79	PREFERRED_VERSION_util-macros = "X11R7.1-1.0.2"
		80	PREFERRED_VERSION_util-macros-native = "X11R7.1-1.0.2"
		81	PREFERRED_VERSION_videoproto = "X11R7.0-2.2.2"
		82	PREFERRED_VERSION_windowswmproto = "X11R7.0-1.0.3"
		83	PREFERRED_VERSION_xauth = "X11R7.0-1.0.1"
		84	PREFERRED_VERSION_xcmiscproto = "X11R7.0-1.1.2"
		85	PREFERRED_VERSION_xcmiscproto-native = "X11R7.0-1.1.2"
		86	PREFERRED_VERSION_xdpyinfo = "X11R7.0-1.0.1"
		87	PREFERRED_VERSION_xextproto = "X11R7.0-7.0.2"
		88	PREFERRED_VERSION_xextproto-native = "X11R7.0-7.0.2"
		89	PREFERRED_VERSION_xf86bigfontproto = "X11R7.0-1.1.2"
		90	PREFERRED_VERSION_xf86bigfontproto-native = "X11R7.0-1.1.2"
		91	PREFERRED_VERSION_xf86dgaproto = "X11R7.0-2.0.2"
		92	PREFERRED_VERSION_xf86driproto = "X11R7.0-2.0.3"
		93	PREFERRED_VERSION_xf86miscproto = "X11R7.0-0.9.2"
		94	PREFERRED_VERSION_xf86rushproto = "X11R7.0-1.1.2"
		95	PREFERRED_VERSION_xf86vidmodeproto = "X11R7.0-2.2.2"
		96	PREFERRED_VERSION_xhost = "X11R7.1-1.0.1"
		97	PREFERRED_VERSION_xineramaproto = "X11R7.0-1.1.2"
		98	PREFERRED_VERSION_xmodmap = "X11R7.1-1.0.1"
		99	PREFERRED_VERSION_xorg-cf-files = "X11R7.1-1.0.2"
		100	PREFERRED_VERSION_xproto = "X11R7.1-7.0.5"
		101	PREFERRED_VERSION_xproto-native = "X11R7.1-7.0.5"
		102	PREFERRED_VERSION_xproxymanagementprotocol = "X11R7.0-1.0.2"
		103	PREFERRED_VERSION_xrandr = "X11R7.1-1.0.2"
		104	PREFERRED_VERSION_xrdb = "X11R7.1-1.0.2"
		105	PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
		106	PREFERRED_VERSION_xserver-xorg = "X11R7.1-1.1.0"
		107	PREFERRED_VERSION_xset = "X11R7.1-1.0.2"
		108	PREFERRED_VERSION_xtrans = "X11R7.0-1.0.0"
		109	PREFERRED_VERSION_xtrans-native = "X11R7.0-1.0.0"


diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index a08abf134c..561effbe29 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf
@@ -103,7 +103,7 @@ SRCDATE_libfakekey ?= "20051101"
103	SRCDATE_xmodmap ?= "20051101"	103	SRCDATE_xmodmap ?= "20051101"
104	SRCDATE_libxrandr ?= "20051101"	104	SRCDATE_libxrandr ?= "20051101"
105	SRCDATE_libxtst ?= "20051101"	105	SRCDATE_libxtst ?= "20051101"
106	SRCDATE_xcalibrate ?= "20051101"	106	SRCDATE_xcalibrate ?= "20060312"
107	SRCDATE_libxmu ?= "20051115"	107	SRCDATE_libxmu ?= "20051115"
108	SRCDATE_xdpyinfo ?= "20051115"	108	SRCDATE_xdpyinfo ?= "20051115"
109	SRCDATE_xauth ?= "20060120"	109	SRCDATE_xauth ?= "20060120"
@@ -127,7 +127,6 @@ PREFERRED_VERSION_matchbox-stroke ?= "0.0+svn${SRCDATE}"
127	PREFERRED_VERSION_matchbox-themes-extra ?= "0.3+svn${SRCDATE}"	127	PREFERRED_VERSION_matchbox-themes-extra ?= "0.3+svn${SRCDATE}"
128	PREFERRED_VERSION_matchbox-wm ?= "1.1"	128	PREFERRED_VERSION_matchbox-wm ?= "1.1"
129	PREFERRED_VERSION_libmatchbox ?= "1.9"	129	PREFERRED_VERSION_libmatchbox ?= "1.9"
130	PREFERRED_VERSION_xserver-kdrive = "0.0+cvs${SRCDATE}"
131		130
132	PREFERRED_VERSION_glib-2.0 ?= "2.10.3"	131	PREFERRED_VERSION_glib-2.0 ?= "2.10.3"
133	PREFERRED_VERSION_glib-2.0-native ?= "2.10.3"	132	PREFERRED_VERSION_glib-2.0-native ?= "2.10.3"
@@ -140,7 +139,6 @@ PREFERRED_VERSION_pango ?= "1.10.1"
140	PREFERRED_VERSION_dbus ?= "0.60"	139	PREFERRED_VERSION_dbus ?= "0.60"
141	PREFERRED_VERSION_gnome-vfs-dbus ?= "2.12.0+cvs${SRCDATE}"	140	PREFERRED_VERSION_gnome-vfs-dbus ?= "2.12.0+cvs${SRCDATE}"
142		141
143	PREFERRED_VERSION_diet-x11 ?= "6.2.1"
144	PREFERRED_VERSION_dillo2 ?= "0.6.6"	142	PREFERRED_VERSION_dillo2 ?= "0.6.6"
145	PREFERRED_VERSION_evince ?= "0.3.2"	143	PREFERRED_VERSION_evince ?= "0.3.2"
146	PREFERRED_VERSION_firefox ?= "1.0"	144	PREFERRED_VERSION_firefox ?= "1.0"
@@ -161,14 +159,15 @@ PREFERRED_VERSION_rxvt-unicode ?= "5.6"
161	PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"	159	PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
162	PREFERRED_VERSION_xdemineur ?= "2.1.1"	160	PREFERRED_VERSION_xdemineur ?= "2.1.1"
163	PREFERRED_VERSION_xextensions ?= "1.0.1"	161	PREFERRED_VERSION_xextensions ?= "1.0.1"
164	PREFERRED_VERSION_xhost ?= "0.0+cvs20040413"	162
		163
165	PREFERRED_VERSION_xmonobut ?= "0.4"	164	PREFERRED_VERSION_xmonobut ?= "0.4"
166	PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}"	165	PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}"
167	PREFERRED_VERSION_xproto ?= "6.6.2"
168	PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
169	PREFERRED_VERSION_xst ?= "0.15"	166	PREFERRED_VERSION_xst ?= "0.15"
170	PREFERRED_VERSION_oprofile ?= "0.9.1+cvs${SRCDATE}"	167	PREFERRED_VERSION_oprofile ?= "0.9.1+cvs${SRCDATE}"
171		168
		169	require conf/distro/include/preferred-xorg-versions.inc
		170
172	PCMCIA_MANAGER ?= "pcmciautils"	171	PCMCIA_MANAGER ?= "pcmciautils"
173		172
174	CVS_TARBALL_STASH += "http://www.o-hand.com/~richard/poky/sources/"	173	CVS_TARBALL_STASH += "http://www.o-hand.com/~richard/poky/sources/"