summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2005-11-18 07:52:00 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-11-18 07:52:00 +0000
commitdc1b9c438381a5365f4787d64defaf60befa3946 (patch)
tree3f441ee36712e4e6f07cc3cd0535c11ad997ef5e
parentb31016aa20216fd9155f919f2112997f519caa30 (diff)
at 3.1.8, atd 0.70: make them conflict/replace each other - close #470
-rw-r--r--packages/at/at_3.1.8.bb6
-rw-r--r--packages/atd/atd_0.70.bb5
2 files changed, 9 insertions, 2 deletions
diff --git a/packages/at/at_3.1.8.bb b/packages/at/at_3.1.8.bb
index 5e6c13ff00..7acbfa9664 100644
--- 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 64f7dc1f6a..5ba524b916 100644
--- 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"