diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-11-14 10:56:02 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-11-14 10:56:02 +0000 |
| commit | b016f9c2bd40fdcafd2ffeb563164ab08e80780c (patch) | |
| tree | 975bdba5c43fed8120dda77ae465958e7ca7a6e5 | |
| parent | 8abdbf47bf643b97ddcc5b8b8774ef67c252c1d4 (diff) | |
| parent | b8826e4bdbacd31e6086dffc212fd435fddd0128 (diff) | |
merge of '4691fac16318391e3125e1a88e96b9003fa1c4f0'
and '9934077f8cc45499fe70c414041ee257c6f7b98d'
| -rw-r--r-- | packages/openmoko2/openmoko-session2.bb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 922dc991db..66ce5da82a 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -3,9 +3,8 @@ LICENSE = "GPL" SECTION = "x11" RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2" RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2" -RREPLACES = "openmoko-session matchbox-common" -RPROVIDES = "matchbox-common" -PR = "r42" +RCONFLICTS_${PN} = "openmoko-session matchbox-common" +PR = "r61" SRC_URI = "\ file://etc \ |