From 305ac49171325d05834a945b373b4e432006d83d Mon Sep 17 00:00:00 2001
From: Matthew Allum <mallum@openedhand.com>
Date: Fri, 2 Sep 2005 14:19:08 +0000
Subject: [PATCH] Add initial poky prefered versions and naming tweaks

git-svn-id: https://svn.o-hand.com/repos/poky@17 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../conf/distro/openzaurus-3.5.4.conf         |  1 +
 openembedded/conf/distro/poky-additions.inc   | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 openembedded/conf/distro/poky-additions.inc

diff --git a/openembedded/conf/distro/openzaurus-3.5.4.conf b/openembedded/conf/distro/openzaurus-3.5.4.conf
index 702cf32ab9..61458c0b03 100644
--- a/openembedded/conf/distro/openzaurus-3.5.4.conf
+++ b/openembedded/conf/distro/openzaurus-3.5.4.conf
@@ -56,3 +56,4 @@ include conf/distro/preferred-gpe-versions-2.7.inc
 #
 include conf/distro/preferred-e-versions.inc
 
+include conf/distro/poky-additions.inc
\ No newline at end of file
diff --git a/openembedded/conf/distro/poky-additions.inc b/openembedded/conf/distro/poky-additions.inc
new file mode 100644
index 0000000000..b882342f98
--- /dev/null
+++ b/openembedded/conf/distro/poky-additions.inc
@@ -0,0 +1,25 @@
+# Overide some bits
+
+DISTRO = "openzaurus"
+DISTRO_NAME = "OpenedHand PokyLinux" # Bad?
+DISTRO_VERSION = "0.0-snapshot-${DATE}"
+
+DISTRO_TYPE = "debug"
+# DISTRO_TYPE = "release"
+
+PREFERRED_PROVIDER_gconf=gconf-dbus
+
+PREFERRED_VERSION_libmatchbox ?= "1.7"
+PREFERRED_VERSION_matchbox ?= "0.9.1"
+PREFERRED_VERSION_matchbox-common ?= "0.9.1"
+PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
+PREFERRED_VERSION_matchbox-wm ?= "svn"
+PREFERRED_VERSION_matchbox-panel ?= "0.9.2"
+PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
+
+PREFERRED_VERSION_atk ?= "1.10.0"
+PREFERRED_VERSION_cairo ?= "1.0.0"
+PREFERRED_VERSION_glib-2.0 ?= "2.8.1"
+PREFERRED_VERSION_gtk+ ?= "2.8.3"
+PREFERRED_VERSION_pango ?= "1.10.0"
+