diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2007-11-13 15:53:40 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2007-11-13 15:53:40 +0000 |
| commit | c1f4717b049f0871ed86d28e305c1268221b4e40 (patch) | |
| tree | 34caa18f5a43b2ac068b3a33d5ac180ce3765469 | |
| parent | 7a429c6177dd3807b755be4fd22912f29f129d2e (diff) | |
| parent | eed2c973db5bdf6546ed9f71f5c59a06376163b7 (diff) | |
merge of '6ef8b55fe81238d3e4be14ca1cbf2f23ab7ee8a1'
and '92881558b2b1ee88b0d0bb08428f57e67a1250c6'
| -rw-r--r-- | packages/openmoko2/openmoko-session2.bb | 3 | ||||
| -rw-r--r-- | packages/openmoko2/openmoko-today2-folders_svn.bb | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 2b18870aec..6a33e62c42 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -4,8 +4,7 @@ SECTION = "x11" RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2" RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2" RCONFLICTS_${PN} = "openmoko-session matchbox-common" -RREPLACES_${PN} = "matchbox-common" -PR = "r40" +PR = "r41" SRC_URI = "\ file://etc \ diff --git a/packages/openmoko2/openmoko-today2-folders_svn.bb b/packages/openmoko2/openmoko-today2-folders_svn.bb index 4f72ac9a94..baf60d877b 100644 --- a/packages/openmoko2/openmoko-today2-folders_svn.bb +++ b/packages/openmoko2/openmoko-today2-folders_svn.bb @@ -1,9 +1,8 @@ DESCRIPTION = "The OpenMoko Today2 vfolder files" SECTION = "openmoko/misc" PV = "0.1.0+svnr${SRCREV}" -PR = "r2" +PR = "r3" RCONFLICTS_${PN} = "matchbox-common" -RREPLACES_${PN} = "matchbox-common" inherit openmoko2 |