at 3.1.8, atd 0.70: make them conflict/replace each other - close #470

diff --git a/packages/at/at_3.1.8.bb b/packages/at/at_3.1.8.bb
index 5e6c13f..7acbfa9 100644 (file)
--- a/packages/at/at_3.1.8.bb
+++ b/packages/at/at_3.1.8.bb
@@ -1,7 +1,11 @@
-DEPENDS = "flex"
 DESCRIPTION = "Delayed job execution and batch processing."
 SECTION = "base"
 LICENSE="BSD"
+DEPENDS = "flex"
+RCONFLICTS = "atd"
+RREPLACES = "atd"
+
+PR = "r1"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}-11.tar.gz \
           file://configure.patch;patch=1 \

diff --git a/packages/atd/atd_0.70.bb b/packages/atd/atd_0.70.bb
index 64f7dc1..5ba524b 100644 (file)
--- a/packages/atd/atd_0.70.bb
+++ b/packages/atd/atd_0.70.bb
@@ -1,7 +1,10 @@
 DESCRIPTION = "Lightweight At Daemon"
 SECTION = "base"
 LICENSE = "GPLV2"
-PR = "r2"
+RCONFLICTS = "at"
+RREPLACES = "at"
+
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=apps/atd;tag=ATD-0_70 \
                        file://no-oknodo.patch;patch=1"