summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-08-28 11:08:53 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-08-28 11:08:53 +0000
commit1039c726d869564027b97e6082a5178c6aefa627 (patch)
tree68f1f9a266d3e0d36e40acdd54cfb2562ebe1b16
parent114a799b814ff4a5fe58a20caf7665a9d9b94b02 (diff)
downloadpoky-1039c726d869564027b97e6082a5178c6aefa627.tar.gz
openmoko-tasks2: conflict with tasks
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2577 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb3
1 files changed, 2 insertions, 1 deletions
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"
2SECTION = "openmoko/pim" 2SECTION = "openmoko/pim"
3DEPENDS = "dbus-glib eds-dbus libmokoui2" 3DEPENDS = "dbus-glib eds-dbus libmokoui2"
4RDEPENDS = "libedata-cal" 4RDEPENDS = "libedata-cal"
5RCONFLICTS = "tasks"
5PV = "0.1.0+svn${SVNREV}" 6PV = "0.1.0+svn${SVNREV}"
6PR = "r0" 7PR = "r1"
7 8
8inherit openmoko2 9inherit openmoko2
9 10