1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb b/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
index 5daeb72762..e1a7e0ef76 100644
--- a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
+++ b/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
@@ -7,11 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 SECTION = "x11"
 DEPENDS = ""
-CONFLICTS = "matchbox-common"
+RCONFLICTS_${PN} = "matchbox-common"
 SRCREV = "810b0b08eb79e4685202da2ec347b990bb467e07"
 PV = "0.1+git${SRCPV}"
-PR = "r0"
+PR = "r1"
 SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"

diff --git a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb b/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb index 5daeb72762..e1a7e0ef76 100644 --- a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb +++ b/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
@@ -7,11 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
7		7
8	SECTION = "x11"	8	SECTION = "x11"
9	DEPENDS = ""	9	DEPENDS = ""
10	CONFLICTS = "matchbox-common"	10	RCONFLICTS_${PN} = "matchbox-common"
11		11
12	SRCREV = "810b0b08eb79e4685202da2ec347b990bb467e07"	12	SRCREV = "810b0b08eb79e4685202da2ec347b990bb467e07"
13	PV = "0.1+git${SRCPV}"	13	PV = "0.1+git${SRCPV}"
14	PR = "r0"	14	PR = "r1"
15		15
16	SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"	16	SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
17		17