summaryrefslogtreecommitdiff
path: root/meta/conf/distro
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-05-31 11:52:18 +0000
committerRoss Burton <ross@openedhand.com>2007-05-31 11:52:18 +0000
commit2add61089dd2619e3224e6384c282bf364cb52b1 (patch)
tree6a7dfda546c7d9c5d53a2c059f32022eb8d0551b /meta/conf/distro
parent2b6f26d4a05835daa54b65c2d5d0dc34cbbd86b2 (diff)
downloadopenembedded-core-2add61089dd2619e3224e6384c282bf364cb52b1.tar.gz
openembedded-core-2add61089dd2619e3224e6384c282bf364cb52b1.tar.bz2
openembedded-core-2add61089dd2619e3224e6384c282bf364cb52b1.tar.xz
openembedded-core-2add61089dd2619e3224e6384c282bf364cb52b1.zip
Clean up matchbox-desktop/matchbox-desktop-2 so that everything is called matchbox-desktop
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1834 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf/distro')
-rw-r--r--meta/conf/distro/poky.conf6
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 02b76e4e9..739b46af8 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -60,7 +60,6 @@ PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
-PREFERRED_PROVIDER_matchbox-desktop ?= "matchbox-desktop-2"
PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2"
@@ -80,8 +79,7 @@ SRCDATE_ipkg-utils ?= "20050930"
SRCDATE_ipkg-link ?= "20050930"
SRCDATE_matchbox-common ?= "20070417"
SRCDATE_matchbox-config-gtk ?= "20070417"
-SRCDATE_matchbox-desktop ?= "20060612"
-SRCDATE_matchbox-desktop-2 ?= "20070531"
+SRCDATE_matchbox-desktop ?= "20070531"
SRCDATE_matchbox-keyboard ?= "20070529"
SRCDATE_matchbox-panel ?= "20060727"
SRCDATE_matchbox-panel-manager ?= "20060612"
@@ -128,7 +126,7 @@ PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
PREFERRED_VERSION_matchbox-applet-startup-monitor ?= "0.1"
PREFERRED_VERSION_matchbox-common ?= "0.9.1+svn${SRCDATE}"
PREFERRED_VERSION_matchbox-config-gtk ?= "0.0+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-desktop ?= "0.9.1+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-desktop ?= "2.0"
PREFERRED_VERSION_matchbox-keyboard ?= "0.0+svn${SRCDATE}"
PREFERRED_VERSION_matchbox-panel ?= "0.9.2+svn${SRCDATE}"
PREFERRED_VERSION_matchbox-stroke ?= "0.0+svn${SRCDATE}"