From 9f0bd5cd2d93a2ed76637ca5bbf207e763fc7edf Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 13 Nov 2007 15:02:00 +0000
Subject: openmoko-session2.bb, openmoko-today2-folders_svn.bb :
 conflict/replace matchbox-common

---
 packages/openmoko2/openmoko-session2.bb           | 5 +++--
 packages/openmoko2/openmoko-today2-folders_svn.bb | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index fd1b0d30ac..2b18870aec 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -3,8 +3,9 @@ LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
 RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
-RCONFLICTS = "openmoko-session"
-PR = "r39"
+RCONFLICTS_${PN} = "openmoko-session matchbox-common"
+RREPLACES_${PN} = "matchbox-common"
+PR = "r40"
 
 SRC_URI = "\
   file://etc \
diff --git a/packages/openmoko2/openmoko-today2-folders_svn.bb b/packages/openmoko2/openmoko-today2-folders_svn.bb
index ecd28d1b68..4f72ac9a94 100644
--- a/packages/openmoko2/openmoko-today2-folders_svn.bb
+++ b/packages/openmoko2/openmoko-today2-folders_svn.bb
@@ -1,7 +1,9 @@
 DESCRIPTION = "The OpenMoko Today2 vfolder files"
 SECTION = "openmoko/misc"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
+RCONFLICTS_${PN} = "matchbox-common"
+RREPLACES_${PN} = "matchbox-common"
 
 inherit openmoko2
 
-- 
cgit v1.2.3

ech-oe.git/refs/?id=ebc27b10a358de05aa950271cea724af3e9160f0'>refs</a><a class='active' href='/cgit/multitech-oe.git/log/packages/tcp-wrappers'>log</a><a href='/cgit/multitech-oe.git/tree/packages/tcp-wrappers?id=ebc27b10a358de05aa950271cea724af3e9160f0'>tree</a><a href='/cgit/multitech-oe.git/commit/packages/tcp-wrappers?id=ebc27b10a358de05aa950271cea724af3e9160f0'>commit</a><a href='/cgit/multitech-oe.git/diff/packages/tcp-wrappers?id=ebc27b10a358de05aa950271cea724af3e9160f0'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit/multitech-oe.git/log/packages/tcp-wrappers'>
<input type='hidden' name='id' value='ebc27b10a358de05aa950271cea724af3e9160f0'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit/multitech-oe.git/log/?id=ebc27b10a358de05aa950271cea724af3e9160f0'>root</a>/<a href='/cgit/multitech-oe.git/log/packages?id=ebc27b10a358de05aa950271cea724af3e9160f0'>packages</a>/<a href='/cgit/multitech-oe.git/log/packages/tcp-wrappers?id=ebc27b10a358de05aa950271cea724af3e9160f0'>tcp-wrappers</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/cgit/multitech-oe.git/log/packages/tcp-wrappers?id=ebc27b10a358de05aa950271cea724af3e9160f0&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Files</th></tr>
<tr><td><span title='2006-09-06 11:40:27 +0000'>2006-09-06</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/tcp-wrappers?id=4826bc3766e6e70e5d2bcaade7a5b1a3f58c92a2'>various: correct typos spotted by Cyril Romain</a></td><td>Koen Kooi</td><td>1</td></tr>
<tr><td><span title='2005-06-30 08:19:37 +0000'>2005-06-30</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/tcp-wrappers?id=c8e5702127e507e82e6f68a4b8c546803accea9d'>import clean BK tree at cset 1.3670</a></td><td>Koen Kooi</td><td>25</td></tr>
<tr><td><span title='2005-04-12 16:18:55 +0000'>2005-04-12</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/tcp-wrappers?id=eca9b8c0ca01c008277a17f1cf9846a7f64f70ad'>tcp-wrappers_7.6.bb:  install libwrap into staging</a></td><td>Koen Kooi</td><td>1</td></tr>
<tr><td><span title='2005-04-02 04:27:59 +0000'>2005-04-02</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/tcp-wrappers?id=30c508369806fc270a5fc323ad5695a1a64e8c42'>Add TCP wrappers version 7.6, using debian's patchset.</a></td><td>Chris Larson</td><td>24</td></tr>
cdp-dev&amp;id=7e053e1b25a0e71ce01fe7239a7da53f4d99e87f'>python-pygobject[-native] 2.12.3: update to 2.14.2, adjust patches and -nativ...</a></td><td>Michael Lauer</td><td>2</td></tr>