summaryrefslogtreecommitdiffstats
path: root/meta/conf/distro/poky.conf
diff options
context:
space:
mode:
authorChris Larson <kergoth@openedhand.com>2006-08-15 11:58:37 +0000
committerChris Larson <kergoth@openedhand.com>2006-08-15 11:58:37 +0000
commitca10363baac7de9581ec90ab47957f973e1dbdc4 (patch)
tree2000b53f806c79510671d8fd1a6a36125f8b25b3 /meta/conf/distro/poky.conf
parentc210d01a7ca8c00ddc45d292878b89086b137129 (diff)
downloadpoky-ca10363baac7de9581ec90ab47957f973e1dbdc4.tar.gz
Numerous new xorg package versions from upstream OE. Pester me if any local changes got inadvertantly lost, or if any packages need upgrading.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@607 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf/distro/poky.conf')
-rw-r--r--meta/conf/distro/poky.conf11
1 files changed, 5 insertions, 6 deletions
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"
103SRCDATE_xmodmap ?= "20051101" 103SRCDATE_xmodmap ?= "20051101"
104SRCDATE_libxrandr ?= "20051101" 104SRCDATE_libxrandr ?= "20051101"
105SRCDATE_libxtst ?= "20051101" 105SRCDATE_libxtst ?= "20051101"
106SRCDATE_xcalibrate ?= "20051101" 106SRCDATE_xcalibrate ?= "20060312"
107SRCDATE_libxmu ?= "20051115" 107SRCDATE_libxmu ?= "20051115"
108SRCDATE_xdpyinfo ?= "20051115" 108SRCDATE_xdpyinfo ?= "20051115"
109SRCDATE_xauth ?= "20060120" 109SRCDATE_xauth ?= "20060120"
@@ -127,7 +127,6 @@ PREFERRED_VERSION_matchbox-stroke ?= "0.0+svn${SRCDATE}"
127PREFERRED_VERSION_matchbox-themes-extra ?= "0.3+svn${SRCDATE}" 127PREFERRED_VERSION_matchbox-themes-extra ?= "0.3+svn${SRCDATE}"
128PREFERRED_VERSION_matchbox-wm ?= "1.1" 128PREFERRED_VERSION_matchbox-wm ?= "1.1"
129PREFERRED_VERSION_libmatchbox ?= "1.9" 129PREFERRED_VERSION_libmatchbox ?= "1.9"
130PREFERRED_VERSION_xserver-kdrive = "0.0+cvs${SRCDATE}"
131 130
132PREFERRED_VERSION_glib-2.0 ?= "2.10.3" 131PREFERRED_VERSION_glib-2.0 ?= "2.10.3"
133PREFERRED_VERSION_glib-2.0-native ?= "2.10.3" 132PREFERRED_VERSION_glib-2.0-native ?= "2.10.3"
@@ -140,7 +139,6 @@ PREFERRED_VERSION_pango ?= "1.10.1"
140PREFERRED_VERSION_dbus ?= "0.60" 139PREFERRED_VERSION_dbus ?= "0.60"
141PREFERRED_VERSION_gnome-vfs-dbus ?= "2.12.0+cvs${SRCDATE}" 140PREFERRED_VERSION_gnome-vfs-dbus ?= "2.12.0+cvs${SRCDATE}"
142 141
143PREFERRED_VERSION_diet-x11 ?= "6.2.1"
144PREFERRED_VERSION_dillo2 ?= "0.6.6" 142PREFERRED_VERSION_dillo2 ?= "0.6.6"
145PREFERRED_VERSION_evince ?= "0.3.2" 143PREFERRED_VERSION_evince ?= "0.3.2"
146PREFERRED_VERSION_firefox ?= "1.0" 144PREFERRED_VERSION_firefox ?= "1.0"
@@ -161,14 +159,15 @@ PREFERRED_VERSION_rxvt-unicode ?= "5.6"
161PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" 159PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
162PREFERRED_VERSION_xdemineur ?= "2.1.1" 160PREFERRED_VERSION_xdemineur ?= "2.1.1"
163PREFERRED_VERSION_xextensions ?= "1.0.1" 161PREFERRED_VERSION_xextensions ?= "1.0.1"
164PREFERRED_VERSION_xhost ?= "0.0+cvs20040413" 162
163
165PREFERRED_VERSION_xmonobut ?= "0.4" 164PREFERRED_VERSION_xmonobut ?= "0.4"
166PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" 165PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}"
167PREFERRED_VERSION_xproto ?= "6.6.2"
168PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
169PREFERRED_VERSION_xst ?= "0.15" 166PREFERRED_VERSION_xst ?= "0.15"
170PREFERRED_VERSION_oprofile ?= "0.9.1+cvs${SRCDATE}" 167PREFERRED_VERSION_oprofile ?= "0.9.1+cvs${SRCDATE}"
171 168
169require conf/distro/include/preferred-xorg-versions.inc
170
172PCMCIA_MANAGER ?= "pcmciautils" 171PCMCIA_MANAGER ?= "pcmciautils"
173 172
174CVS_TARBALL_STASH += "http://www.o-hand.com/~richard/poky/sources/" 173CVS_TARBALL_STASH += "http://www.o-hand.com/~richard/poky/sources/"