1 files changed, 53 insertions, 53 deletions
diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf
index d628b1d3fc..ad35c65b00 100644
--- a/openembedded/conf/distro/poky.conf
+++ b/openembedded/conf/distro/poky.conf
@@ -73,44 +73,44 @@ PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
 #
 # CVS Dates to use:
 #
-#CVSDATE_gnome-vfs-dbus = "20051215"
+#SRCDATE_gnome-vfs-dbus = "20051215"
-CVSDATE_gconf-dbus = "20060119"
+SRCDATE_gconf-dbus = "20060119"
-CVSDATE_gnome-vfs-dbus = "20060119"
+SRCDATE_gnome-vfs-dbus = "20060119"
-CVSDATE_contacts = "20060207"
+SRCDATE_contacts = "20060207"
-CVSDATE_dates = "20060120"
+SRCDATE_dates = "20060120"
-CVSDATE_eds-dbus = "20060126"
+SRCDATE_eds-dbus = "20060126"
-CVSDATE_minimo = "20050401"
+SRCDATE_minimo = "20050401"
-CVSDATE_ipkg-utils-native = "20050930"
+SRCDATE_ipkg-utils-native = "20050930"
-CVSDATE_ipkg-link-1 = "20050930"
+SRCDATE_ipkg-link-1 = "20050930"
-CVSDATE_ipkg-utils = "20050930"
+SRCDATE_ipkg-utils = "20050930"
-CVSDATE_ipkg-link = "20050930"
+SRCDATE_ipkg-link = "20050930"
-CVSDATE_matchbox-common = "20051101"
+SRCDATE_matchbox-common = "20051101"
-CVSDATE_matchbox-config-gtk = "20051101"
+SRCDATE_matchbox-config-gtk = "20051101"
-CVSDATE_matchbox-desktop = "20060120"
+SRCDATE_matchbox-desktop = "20060120"
-CVSDATE_matchbox-keyboard = "20051101"
+SRCDATE_matchbox-keyboard = "20051101"
-CVSDATE_matchbox-panel = "20051101"
+SRCDATE_matchbox-panel = "20051101"
-CVSDATE_matchbox-panel-manager = "20051101"
+SRCDATE_matchbox-panel-manager = "20051101"
-CVSDATE_matchbox-stroke = "20051101"
+SRCDATE_matchbox-stroke = "20051101"
-CVSDATE_matchbox-themes-extra = "20051101"
+SRCDATE_matchbox-themes-extra = "20051101"
-CVSDATE_matchbox-wm = "20060120"
+SRCDATE_matchbox-wm = "20060120"
-CVSDATE_libmatchbox = "20060120"
+SRCDATE_libmatchbox = "20060120"
-CVSDATE_tslib = "20051101"
+SRCDATE_tslib = "20051101"
-CVSDATE_xext = "20051101"
+SRCDATE_xext = "20051101"
-CVSDATE_renderext = "20051101"
+SRCDATE_renderext = "20051101"
-CVSDATE_libxrender = "20051101"
+SRCDATE_libxrender = "20051101"
-CVSDATE_fixesext = "20051101"
+SRCDATE_fixesext = "20051101"
-CVSDATE_damageext = "20051101"
+SRCDATE_damageext = "20051101"
-CVSDATE_compositeext = "20051101"
+SRCDATE_compositeext = "20051101"
-CVSDATE_xcalibrateext = "20051101"
+SRCDATE_xcalibrateext = "20051101"
-CVSDATE_recordext = "20051101"
+SRCDATE_recordext = "20051101"
-CVSDATE_libfakekey = "20051101"
+SRCDATE_libfakekey = "20051101"
-CVSDATE_xmodmap = "20051101"
+SRCDATE_xmodmap = "20051101"
-CVSDATE_xrandr = "20051101"
+SRCDATE_xrandr = "20051101"
-CVSDATE_xtst = "20051101"
+SRCDATE_xtst = "20051101"
-CVSDATE_xcalibrate = "20051101"
+SRCDATE_xcalibrate = "20051101"
-CVSDATE_xmu = "20051115"
+SRCDATE_xmu = "20051115"
-CVSDATE_xdpyinfo = "20051115"
+SRCDATE_xdpyinfo = "20051115"
-CVSDATE_xauth = "20060120"
+SRCDATE_xauth = "20060120"
 #
 # Preferred Versions:
@@ -118,15 +118,15 @@ CVSDATE_xauth = "20060120"
 PREFERRED_VERSION_matchbox = "0.9.1"
 PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6"
 PREFERRED_VERSION_matchbox-applet-startup-monitor = "0.1"
-PREFERRED_VERSION_matchbox-common = "0.9.1+cvs-${CVSDATE}"
+PREFERRED_VERSION_matchbox-common = "0.9.1+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-config-gtk = "0.0+cvs-${CVSDATE}"
+PREFERRED_VERSION_matchbox-config-gtk = "0.0+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-desktop = "0.9.1+cvs-${CVSDATE}"
+PREFERRED_VERSION_matchbox-desktop = "0.9.1+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-keyboard = "0.0+cvs-${CVSDATE}"
+PREFERRED_VERSION_matchbox-keyboard = "0.0+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-panel = "0.9.2+cvs-${CVSDATE}"
+PREFERRED_VERSION_matchbox-panel = "0.9.2+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-stroke = "0.0+cvs-${CVSDATE}"
+PREFERRED_VERSION_matchbox-stroke = "0.0+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-themes-extra = "0.3+cvs-${CVSDATE}"
+PREFERRED_VERSION_matchbox-themes-extra = "0.3+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-wm = "0.9.5+cvs-${CVSDATE}"
+PREFERRED_VERSION_matchbox-wm = "0.9.5+svn${SRCDATE}"
-PREFERRED_VERSION_libmatchbox = "1.7+cvs-${CVSDATE}"
+PREFERRED_VERSION_libmatchbox = "1.7+svn${SRCDATE}"
 #PREFERRED_VERSION_atk = "1.10.0"
 #PREFERRED_VERSION_cairo = "1.0.0"
@@ -155,18 +155,18 @@ PREFERRED_VERSION_libschedule ?= "0.15"
 PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
 PREFERRED_VERSION_linphone ?= "0.12.2"
 PREFERRED_VERSION_minilite ?= "0.49"
-PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
+PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}"
 PREFERRED_VERSION_poppler ?= "0.3.3"
-PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}"
 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.0cvs20040413"
+PREFERRED_VERSION_xhost ?= "0.0+cvs20040413"
 PREFERRED_VERSION_xmonobut ?= "0.4"
-PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" 
+PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" 
 PREFERRED_VERSION_xproto ?= "6.6.2"
-PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
 PREFERRED_VERSION_xst ?= "0.15"
-PREFERRED_VERSION_oprofile ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_oprofile ?= "0.0+cvs${SRCDATE}"

diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf index d628b1d3fc..ad35c65b00 100644 --- a/openembedded/conf/distro/poky.conf +++ b/openembedded/conf/distro/poky.conf
@@ -73,44 +73,44 @@ PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
73	#	73	#
74	# CVS Dates to use:	74	# CVS Dates to use:
75	#	75	#
76	#CVSDATE_gnome-vfs-dbus = "20051215"	76	#SRCDATE_gnome-vfs-dbus = "20051215"
77	CVSDATE_gconf-dbus = "20060119"	77	SRCDATE_gconf-dbus = "20060119"
78	CVSDATE_gnome-vfs-dbus = "20060119"	78	SRCDATE_gnome-vfs-dbus = "20060119"
79	CVSDATE_contacts = "20060207"	79	SRCDATE_contacts = "20060207"
80	CVSDATE_dates = "20060120"	80	SRCDATE_dates = "20060120"
81	CVSDATE_eds-dbus = "20060126"	81	SRCDATE_eds-dbus = "20060126"
82	CVSDATE_minimo = "20050401"	82	SRCDATE_minimo = "20050401"
83	CVSDATE_ipkg-utils-native = "20050930"	83	SRCDATE_ipkg-utils-native = "20050930"
84	CVSDATE_ipkg-link-1 = "20050930"	84	SRCDATE_ipkg-link-1 = "20050930"
85	CVSDATE_ipkg-utils = "20050930"	85	SRCDATE_ipkg-utils = "20050930"
86	CVSDATE_ipkg-link = "20050930"	86	SRCDATE_ipkg-link = "20050930"
87	CVSDATE_matchbox-common = "20051101"	87	SRCDATE_matchbox-common = "20051101"
88	CVSDATE_matchbox-config-gtk = "20051101"	88	SRCDATE_matchbox-config-gtk = "20051101"
89	CVSDATE_matchbox-desktop = "20060120"	89	SRCDATE_matchbox-desktop = "20060120"
90	CVSDATE_matchbox-keyboard = "20051101"	90	SRCDATE_matchbox-keyboard = "20051101"
91	CVSDATE_matchbox-panel = "20051101"	91	SRCDATE_matchbox-panel = "20051101"
92	CVSDATE_matchbox-panel-manager = "20051101"	92	SRCDATE_matchbox-panel-manager = "20051101"
93	CVSDATE_matchbox-stroke = "20051101"	93	SRCDATE_matchbox-stroke = "20051101"
94	CVSDATE_matchbox-themes-extra = "20051101"	94	SRCDATE_matchbox-themes-extra = "20051101"
95	CVSDATE_matchbox-wm = "20060120"	95	SRCDATE_matchbox-wm = "20060120"
96	CVSDATE_libmatchbox = "20060120"	96	SRCDATE_libmatchbox = "20060120"
97	CVSDATE_tslib = "20051101"	97	SRCDATE_tslib = "20051101"
98	CVSDATE_xext = "20051101"	98	SRCDATE_xext = "20051101"
99	CVSDATE_renderext = "20051101"	99	SRCDATE_renderext = "20051101"
100	CVSDATE_libxrender = "20051101"	100	SRCDATE_libxrender = "20051101"
101	CVSDATE_fixesext = "20051101"	101	SRCDATE_fixesext = "20051101"
102	CVSDATE_damageext = "20051101"	102	SRCDATE_damageext = "20051101"
103	CVSDATE_compositeext = "20051101"	103	SRCDATE_compositeext = "20051101"
104	CVSDATE_xcalibrateext = "20051101"	104	SRCDATE_xcalibrateext = "20051101"
105	CVSDATE_recordext = "20051101"	105	SRCDATE_recordext = "20051101"
106	CVSDATE_libfakekey = "20051101"	106	SRCDATE_libfakekey = "20051101"
107	CVSDATE_xmodmap = "20051101"	107	SRCDATE_xmodmap = "20051101"
108	CVSDATE_xrandr = "20051101"	108	SRCDATE_xrandr = "20051101"
109	CVSDATE_xtst = "20051101"	109	SRCDATE_xtst = "20051101"
110	CVSDATE_xcalibrate = "20051101"	110	SRCDATE_xcalibrate = "20051101"
111	CVSDATE_xmu = "20051115"	111	SRCDATE_xmu = "20051115"
112	CVSDATE_xdpyinfo = "20051115"	112	SRCDATE_xdpyinfo = "20051115"
113	CVSDATE_xauth = "20060120"	113	SRCDATE_xauth = "20060120"
114		114
115	#	115	#
116	# Preferred Versions:	116	# Preferred Versions:
@@ -118,15 +118,15 @@ CVSDATE_xauth = "20060120"
118	PREFERRED_VERSION_matchbox = "0.9.1"	118	PREFERRED_VERSION_matchbox = "0.9.1"
119	PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6"	119	PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6"
120	PREFERRED_VERSION_matchbox-applet-startup-monitor = "0.1"	120	PREFERRED_VERSION_matchbox-applet-startup-monitor = "0.1"
121	PREFERRED_VERSION_matchbox-common = "0.9.1+cvs-${CVSDATE}"	121	PREFERRED_VERSION_matchbox-common = "0.9.1+svn${SRCDATE}"
122	PREFERRED_VERSION_matchbox-config-gtk = "0.0+cvs-${CVSDATE}"	122	PREFERRED_VERSION_matchbox-config-gtk = "0.0+svn${SRCDATE}"
123	PREFERRED_VERSION_matchbox-desktop = "0.9.1+cvs-${CVSDATE}"	123	PREFERRED_VERSION_matchbox-desktop = "0.9.1+svn${SRCDATE}"
124	PREFERRED_VERSION_matchbox-keyboard = "0.0+cvs-${CVSDATE}"	124	PREFERRED_VERSION_matchbox-keyboard = "0.0+svn${SRCDATE}"
125	PREFERRED_VERSION_matchbox-panel = "0.9.2+cvs-${CVSDATE}"	125	PREFERRED_VERSION_matchbox-panel = "0.9.2+svn${SRCDATE}"
126	PREFERRED_VERSION_matchbox-stroke = "0.0+cvs-${CVSDATE}"	126	PREFERRED_VERSION_matchbox-stroke = "0.0+svn${SRCDATE}"
127	PREFERRED_VERSION_matchbox-themes-extra = "0.3+cvs-${CVSDATE}"	127	PREFERRED_VERSION_matchbox-themes-extra = "0.3+svn${SRCDATE}"
128	PREFERRED_VERSION_matchbox-wm = "0.9.5+cvs-${CVSDATE}"	128	PREFERRED_VERSION_matchbox-wm = "0.9.5+svn${SRCDATE}"
129	PREFERRED_VERSION_libmatchbox = "1.7+cvs-${CVSDATE}"	129	PREFERRED_VERSION_libmatchbox = "1.7+svn${SRCDATE}"
130		130
131	#PREFERRED_VERSION_atk = "1.10.0"	131	#PREFERRED_VERSION_atk = "1.10.0"
132	#PREFERRED_VERSION_cairo = "1.0.0"	132	#PREFERRED_VERSION_cairo = "1.0.0"
@@ -155,18 +155,18 @@ PREFERRED_VERSION_libschedule ?= "0.15"
155	PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"	155	PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
156	PREFERRED_VERSION_linphone ?= "0.12.2"	156	PREFERRED_VERSION_linphone ?= "0.12.2"
157	PREFERRED_VERSION_minilite ?= "0.49"	157	PREFERRED_VERSION_minilite ?= "0.49"
158	PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"	158	PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}"
159	PREFERRED_VERSION_poppler ?= "0.3.3"	159	PREFERRED_VERSION_poppler ?= "0.3.3"
160	PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}"	160	PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}"
161	PREFERRED_VERSION_rxvt-unicode ?= "5.6"	161	PREFERRED_VERSION_rxvt-unicode ?= "5.6"
162	PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"	162	PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
163	PREFERRED_VERSION_xdemineur ?= "2.1.1"	163	PREFERRED_VERSION_xdemineur ?= "2.1.1"
164	PREFERRED_VERSION_xextensions ?= "1.0.1"	164	PREFERRED_VERSION_xextensions ?= "1.0.1"
165	PREFERRED_VERSION_xhost ?= "0.0cvs20040413"	165	PREFERRED_VERSION_xhost ?= "0.0+cvs20040413"
166	PREFERRED_VERSION_xmonobut ?= "0.4"	166	PREFERRED_VERSION_xmonobut ?= "0.4"
167	PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}"	167	PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}"
168	PREFERRED_VERSION_xproto ?= "6.6.2"	168	PREFERRED_VERSION_xproto ?= "6.6.2"
169	PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"	169	PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
170	PREFERRED_VERSION_xst ?= "0.15"	170	PREFERRED_VERSION_xst ?= "0.15"
171		171
172	PREFERRED_VERSION_oprofile ?= "0.0cvs${CVSDATE}"	172	PREFERRED_VERSION_oprofile ?= "0.0+cvs${SRCDATE}"