From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Tue, 28 Aug 2007 11:08:53 +0000 (+0000)
Subject: openmoko-tasks2: conflict with tasks
X-Git-Tag: 2011-1~10842
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=1039c726d869564027b97e6082a5178c6aefa627;p=openembedded-core.git

openmoko-tasks2: conflict with tasks

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2577 311d38ba-8fff-0310-9ca6-ca027cbcb966
---

diff --git a/meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb
index 866a1896e0..c76ce709bb 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb
@@ -2,8 +2,9 @@ DESCRIPTION = "The OpenMoko Agenda"
 SECTION = "openmoko/pim"
 DEPENDS = "dbus-glib eds-dbus libmokoui2"
 RDEPENDS = "libedata-cal"
+RCONFLICTS = "tasks"
 PV = "0.1.0+svn${SVNREV}"
-PR = "r0"
+PR = "r1"
 
 inherit openmoko2