[oe-commits] org.oe.dev (openmoko-)dates: fix Rconflicts/Rreplaces: they do not replace each other but conflict and only PN

[hrw commit]

(openmoko-)dates: fix Rconflicts/Rreplaces: they do not replace each other but conflict and only PN

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 844f33ecedcd7290081e897e5557e7a5b56b5724
ViewMTN: http://monotone.openembedded.org/revision.psp?id=844f33ecedcd7290081e897e5557e7a5b56b5724
Files:
1
packages/openmoko-pim/openmoko-dates_svn.bb
packages/pimlico/dates.inc
packages/pimlico/dates_0.3.1.bb
packages/pimlico/dates_svn.bb
Diffs:

#
# mt diff -ra6d59a0d4f8e98c4a4162aab4c45c8dda36ec6a6 -r844f33ecedcd7290081e897e5557e7a5b56b5724
#
# 
# 
# patch "packages/openmoko-pim/openmoko-dates_svn.bb"
#  from [20a9e6532534f98641249d3415259acb51f782d4]
#    to [094606a56615609dc5f22795b2655b78dc047ae1]
# 
# patch "packages/pimlico/dates.inc"
#  from [3c8175461e2a23c3fe274e3a505e5a6ee08ac90b]
#    to [9f0e88eb705aea6d26e6167c39a5b84e8fe207b8]
# 
# patch "packages/pimlico/dates_0.3.1.bb"
#  from [80a887d5c62bb01c78a0805df7d5773d4b729cc5]
#    to [9b954380ecd7dbd8298eeabeefdffbf9af723839]
# 
# patch "packages/pimlico/dates_svn.bb"
#  from [bf8526b69a3d4b919e5b5b3be7b3aa24a4af9115]
#    to [30de543125fcbf1c7f67eca88c4e1fdf5b86cdc0]
# 
============================================================
--- packages/openmoko-pim/openmoko-dates_svn.bb	20a9e6532534f98641249d3415259acb51f782d4
+++ packages/openmoko-pim/openmoko-dates_svn.bb	094606a56615609dc5f22795b2655b78dc047ae1
@@ -1,12 +1,11 @@ RDEPENDS = "libedata-cal"
 DESCRIPTION = "Dates is a calendar application."
 SECTION = "openmoko/pim"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 gtk+ libglade eds-dbus openmoko-libs"
 RDEPENDS = "libedata-cal"
-RCONFLICTS = "dates"
-RREPLACES = "dates"
+RCONFLICTS_${PN} = "dates"
 PV = "0.1+svn${SRCDATE}"
-PR = "r7"
+PR = "r8"
 
 inherit gnome autotools pkgconfig gtk-icon-cache
 
============================================================
--- packages/pimlico/dates.inc	3c8175461e2a23c3fe274e3a505e5a6ee08ac90b
+++ packages/pimlico/dates.inc	9f0e88eb705aea6d26e6167c39a5b84e8fe207b8
@@ -1,10 +1,9 @@ RDEPENDS = "libedata-cal"
 DESCRIPTION = "Dates is a calendar application."
 LICENSE = "LGPL"
 SECTION = "x11"
 DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
 RDEPENDS = "libedata-cal"
-RCONFLICTS = "openmoko-dates"
-RREPLACES = "openmoko-dates"
+RCONFLICTS_${PN} = "openmoko-dates"
 
 inherit autotools pkgconfig gtk-icon-cache
 
============================================================
--- packages/pimlico/dates_0.3.1.bb	80a887d5c62bb01c78a0805df7d5773d4b729cc5
+++ packages/pimlico/dates_0.3.1.bb	9b954380ecd7dbd8298eeabeefdffbf9af723839
@@ -1,5 +1,5 @@ require dates.inc
 require dates.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz"
============================================================
--- packages/pimlico/dates_svn.bb	bf8526b69a3d4b919e5b5b3be7b3aa24a4af9115
+++ packages/pimlico/dates_svn.bb	30de543125fcbf1c7f67eca88c4e1fdf5b86cdc0
@@ -1,6 +1,6 @@ require dates.inc
 require dates.inc
 
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"