]> git.openpandora.org Git - openembedded.git/commitdiff
(openmoko-)dates: fix Rconflicts/Rreplaces: they do not replace each other but confli...
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 30 Mar 2007 13:27:13 +0000 (13:27 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 30 Mar 2007 13:27:13 +0000 (13:27 +0000)
packages/openmoko-pim/openmoko-dates_svn.bb
packages/pimlico/dates.inc
packages/pimlico/dates_0.3.1.bb
packages/pimlico/dates_svn.bb

index cc5978f5462cbb9d917a5b99f2a95da049274008..af927ddc47b962bdc845a9d702450749b63743e7 100644 (file)
@@ -3,10 +3,9 @@ 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
 
index 641ff60aea81ee35b6bccc07b786665950397073..4f92b2c7676ddab25264298f0c957a9189d0b0e2 100644 (file)
@@ -3,8 +3,7 @@ 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
 
index 731ca31289c3e7d8445b67e9df1bead26d9c8d3c..176d2b9077797f914ceaa23216fc82ef33b37f30 100644 (file)
@@ -1,5 +1,5 @@
 require dates.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz"
index 956eb3dc6468caa1a4a8c1f8d1a0a1682d215a19..cac0eb4faecc4382fe7c9883be108be13e37dd95 100644 (file)
@@ -1,6 +1,6 @@
 require dates.inc
 
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"