diff options
author | Klaus Kurzmann <mok@fluxnetz.de> | 2009-12-19 21:22:08 +0100 |
---|---|---|
committer | Klaus Kurzmann <mok@fluxnetz.de> | 2009-12-19 21:22:08 +0100 |
commit | 537e510feece03264ce496499e3e85768b428b74 (patch) | |
tree | 16af6e51d655b204d1a67a69b82fa5000af87e88 /recipes/shr | |
parent | 6f78f611040c850b0046abdb2c7cdd9e53e10c54 (diff) |
phoneuid: make it rconflict with shr-today
Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>
Diffstat (limited to 'recipes/shr')
-rw-r--r-- | recipes/shr/phoneuid_git.bb | 3 |
1 files changed, 2 insertions, 1 deletions
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" |