From: Klaus Kurzmann <mok@fluxnetz.de>
Date: Sat, 19 Dec 2009 20:22:08 +0000 (+0100)
Subject: phoneuid: make it rconflict with shr-today
X-Git-Tag: Release-2010-05/1~1247
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=537e510feece03264ce496499e3e85768b428b74;p=openembedded.git

phoneuid: make it rconflict with shr-today

Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>
---

diff --git a/recipes/shr/phoneuid_git.bb b/recipes/shr/phoneuid_git.bb
index 6bf4eb828a..ddd0e09508 100644
--- a/recipes/shr/phoneuid_git.bb
+++ b/recipes/shr/phoneuid_git.bb
@@ -4,9 +4,10 @@ LICENSE = "GPL"
 SECTION = "x11/applications"
 DEPENDS += " dbus-glib libframeworkd-glib libphone-ui sqlite3 shr-specs"
 PV = "0.0.0+gitr${SRCREV}"
-PR = "r5"
+PR = "r6"
 
 RREPLACES_${PN} = "shr-today"
+RCONFLICTS_${PN} = "shr-today"
 
 SRC_URI = "git://git.shr-project.org/repo/phoneuid.git;protocol=http;branch=master"
 S = "${WORKDIR}/git"