diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-08-28 11:08:53 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-08-28 11:08:53 +0000 |
| commit | 1039c726d869564027b97e6082a5178c6aefa627 (patch) | |
| tree | 68f1f9a266d3e0d36e40acdd54cfb2562ebe1b16 /meta-openmoko | |
| parent | 114a799b814ff4a5fe58a20caf7665a9d9b94b02 (diff) | |
| download | poky-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
Diffstat (limited to 'meta-openmoko')
| -rw-r--r-- | meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb | 3 |
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" | |||
| 2 | SECTION = "openmoko/pim" | 2 | SECTION = "openmoko/pim" |
| 3 | DEPENDS = "dbus-glib eds-dbus libmokoui2" | 3 | DEPENDS = "dbus-glib eds-dbus libmokoui2" |
| 4 | RDEPENDS = "libedata-cal" | 4 | RDEPENDS = "libedata-cal" |
| 5 | RCONFLICTS = "tasks" | ||
| 5 | PV = "0.1.0+svn${SVNREV}" | 6 | PV = "0.1.0+svn${SVNREV}" |
| 6 | PR = "r0" | 7 | PR = "r1" |
| 7 | 8 | ||
| 8 | inherit openmoko2 | 9 | inherit openmoko2 |
| 9 | 10 | ||