[oe-commits] Klaus Kurzmann : phoneuid: make it rconflict with shr-today
git version control
git at git.openembedded.org
Sat Dec 19 20:22:18 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 537e510feece03264ce496499e3e85768b428b74
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=537e510feece03264ce496499e3e85768b428b74
Author: Klaus Kurzmann <mok at fluxnetz.de>
Date: Sat Dec 19 21:22:08 2009 +0100
phoneuid: make it rconflict with shr-today
Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>
---
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 6bf4eb8..ddd0e09 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"
More information about the Openembedded-commits
mailing list