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 866a1896e03d58afca9d8e2bde0ac55f739ee135..c76ce709bb77663bfd2e302390afa48a3afad427 100644 (file)
--- 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