[oe-commits] org.oe.dev openmoko-session2.bb, openmoko-today2-folders_svn.bb : reduce this to

[xora commit]

openmoko-session2.bb, openmoko-today2-folders_svn.bb : reduce this to
conflicts only, koen reminded us of the problems we had before with RREPACES

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 92881558b2b1ee88b0d0bb08428f57e67a1250c6
ViewMTN: http://monotone.openembedded.org/revision/info/92881558b2b1ee88b0d0bb08428f57e67a1250c6
Files:
1
packages/openmoko2/openmoko-session2.bb
packages/openmoko2/openmoko-today2-folders_svn.bb
Diffs:

#
# mt diff -r2c836c72090e9a06860096627e902f49c103f562 -r92881558b2b1ee88b0d0bb08428f57e67a1250c6
#
# 
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [f186993a5ae9b6417b6d498b2e29dc8164dad287]
#    to [f6635b41edbfb8e7f33d5335810429dd06cb03a5]
# 
# patch "packages/openmoko2/openmoko-today2-folders_svn.bb"
#  from [90e242a90fac296a369c67150653c19f6e9356d5]
#    to [956d96368858c8c2d572532cab005e6a6c738c93]
# 
============================================================
--- packages/openmoko2/openmoko-session2.bb	f186993a5ae9b6417b6d498b2e29dc8164dad287
+++ packages/openmoko2/openmoko-session2.bb	f6635b41edbfb8e7f33d5335810429dd06cb03a5
@@ -1,11 +1,10 @@ RCONFLICTS_${PN} = "openmoko-session mat
 DESCRIPTION = "Custom Matchbox session files for OpenMoko"
 LICENSE = "GPL"
 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 \
============================================================
--- packages/openmoko2/openmoko-today2-folders_svn.bb	90e242a90fac296a369c67150653c19f6e9356d5
+++ packages/openmoko2/openmoko-today2-folders_svn.bb	956d96368858c8c2d572532cab005e6a6c738c93
@@ -1,9 +1,8 @@ PV = "0.1.0+svnr${SRCREV}"
 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