summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-04-25 16:03:27 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-04-25 16:03:27 +0000
commit2558e919745ada6e327701e6abb86cfdf7edd0d8 (patch)
tree8cdd2197b6a494a6af03a4cf3caaf436251811f2
parentbb59ece1181a8fd9d10d98a0a24d2468d5f9e8b4 (diff)
downloadpoky-2558e919745ada6e327701e6abb86cfdf7edd0d8.tar.gz
matchbox-desktop-2: only PN has to conflict/replace mb-desktop-1
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1561 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/matchbox-desktop-2/matchbox-desktop-2_svn.bb9
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/packages/matchbox-desktop-2/matchbox-desktop-2_svn.bb b/meta/packages/matchbox-desktop-2/matchbox-desktop-2_svn.bb
index 4acc005377..09dfaa5e01 100644
--- a/meta/packages/matchbox-desktop-2/matchbox-desktop-2_svn.bb
+++ b/meta/packages/matchbox-desktop-2/matchbox-desktop-2_svn.bb
@@ -4,11 +4,12 @@ DEPENDS = "gtk+ startup-notification"
4RDEPENDS = "matchbox-common" 4RDEPENDS = "matchbox-common"
5SECTION = "x11/wm" 5SECTION = "x11/wm"
6PV = "0.0+svn${SRCDATE}" 6PV = "0.0+svn${SRCDATE}"
7PR = "r1"
7 8
8PROVIDES = matchbox-desktop 9PROVIDES_${PN} = matchbox-desktop
9RPROVIDES = matchbox-desktop 10RPROVIDES_${PN} = matchbox-desktop
10RREPLACES = matchbox-desktop 11RREPLACES_${PN} = matchbox-desktop
11RCONFLICTS = matchbox-desktop 12RCONFLICTS_${PN} = matchbox-desktop
12 13
13SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" 14SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
14 15