summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2005-09-17 18:17:24 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-09-17 18:17:24 +0000
commit16e2f8efc0c366a91f2d7f934f87b238c1ba540c (patch)
tree68d3aaec684de87da5f93a8bbd947051489b28c7
parent7b8968f78aad49a1b20dd416724cc0515b53d5c2 (diff)
parent85298370562e1b5b6f53dede7fdef8899672f401 (diff)
merge of 0a6a434569e334132e34bc3e542f512c7505ba89
and 912340c2ffb2a6e611a7a4144472515e1110d583
-rw-r--r--conf/distro/preferred-gpe-versions-2.7.inc2
-rw-r--r--packages/matchbox-wm/matchbox-wm_svn.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc
index c901c86831..73db19a097 100644
--- a/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/preferred-gpe-versions-2.7.inc
@@ -13,7 +13,7 @@ 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 ?= "0.9.5"
+PREFERRED_VERSION_matchbox-wm ?= "0.9.5+cvs-${CVSDATE}"
PREFERRED_VERSION_matchbox-panel ?= "0.9.2"
PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
PREFERRED_VERSION_atk ?= "1.9.0"
diff --git a/packages/matchbox-wm/matchbox-wm_svn.bb b/packages/matchbox-wm/matchbox-wm_svn.bb
index fdf38d6e68..d747243740 100644
--- a/packages/matchbox-wm/matchbox-wm_svn.bb
+++ b/packages/matchbox-wm/matchbox-wm_svn.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Matchbox window manager"
LICENSE = "GPL"
DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
RDEPENDS = "matchbox-common"
-PV = "0.9cvs${CVSDATE}"
+PV = "0.9.5+cvs-${CVSDATE}"
PR = "r1"
DEFAULT_PREFERENCE = "-1"