[oe-commits] org.oe.dev mpg123+mpg321: rreplace and rconflict (with) each other

[mickeyl commit]

mpg123+mpg321: rreplace and rconflict (with) each other

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: d56afe7fa243cd0f2feab2dd537cc8dbfe1d91fc
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d56afe7fa243cd0f2feab2dd537cc8dbfe1d91fc
Files:
1
packages/mpg123/mpg123_0.66.bb
packages/mpg321/mpg321_0.2.10.bb
Diffs:

#
# mt diff -rbcfbf5d301f308b3a8ae1d53ad25cddcba298064 -rd56afe7fa243cd0f2feab2dd537cc8dbfe1d91fc
#
# 
# 
# patch "packages/mpg123/mpg123_0.66.bb"
#  from [c82104160067aaaa1b94c139fbefc3d22e613750]
#    to [5156d8b5ff1be7b94a2c6011759d36af029a2e3c]
# 
# patch "packages/mpg321/mpg321_0.2.10.bb"
#  from [a93ce4228b6bcfde17ba46398fa2484c9791309a]
#    to [20edcd4a7e6fa1c263f5c5a9a77bf6bb5bca373f]
# 
============================================================
--- packages/mpg123/mpg123_0.66.bb	c82104160067aaaa1b94c139fbefc3d22e613750
+++ packages/mpg123/mpg123_0.66.bb	5156d8b5ff1be7b94a2c6011759d36af029a2e3c
@@ -1,11 +1,11 @@
-DESCRIPTION = "mpg123 is the fast and Free \
-console based real time MPEG Audio Player for \
-Layer 1, 2 and 3. It uses floating point math (unlike libmad)."
+DESCRIPTION = "mpg123 is a fast and free console based real time MPEG Audio Player \
+for Layer 1, 2 and 3. It uses floating point math (unlike libmad)."
 LICENSE = "LGPL"
 DESCRIPTION = "multimedia"
 HOMEPAGE = "http://www.mpg123.de"
+RCONFLICTS = "mpg321"
+RREPLACES = "mpg321"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mpg123/mpg123-${PV}.tar.bz2"
 
 inherit autotools
-
============================================================
--- packages/mpg321/mpg321_0.2.10.bb	a93ce4228b6bcfde17ba46398fa2484c9791309a
+++ packages/mpg321/mpg321_0.2.10.bb	20edcd4a7e6fa1c263f5c5a9a77bf6bb5bca373f
@@ -1,12 +1,14 @@
-DESCRIPTION = "mpg321 is a Free replacement for mpg123, a very popular command-line mp3 player."
+DESCRIPTION = "mpg321 is a replacement for mpg123, a very popular command-line mp3 player."
 SECTION = "console/multimedia"
 DEPENDS = "libmad libao"
 LICENSE = "GPL"
 AUTHOR = "Joe Drew <hoserhead at woot.net>"
 HOMEPAGE = "http://mpg321.sourceforge.net/"
+RCONFLICTS = "mpg123"
+RREPLACES = "mpg123"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mpg321/mpg321-0.2.10.tar.gz \
-file://libao.m4.patch;patch=1"
+           file://libao.m4.patch;patch=1"
 
 inherit autotools