From 0147108905c342621fe7a2aaa7a5dad59c940aee Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 18 Jun 2007 10:46:29 +0000 Subject: [PATCH] mpg123+mpg321: rreplace and rconflict (with) each other --- packages/mpg123/mpg123_0.66.bb | 8 ++++---- packages/mpg321/mpg321_0.2.10.bb | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/mpg123/mpg123_0.66.bb b/packages/mpg123/mpg123_0.66.bb index 9677b1f1d1..a92cf877a9 100644 --- a/packages/mpg123/mpg123_0.66.bb +++ b/packages/mpg123/mpg123_0.66.bb @@ -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 - diff --git a/packages/mpg321/mpg321_0.2.10.bb b/packages/mpg321/mpg321_0.2.10.bb index ccd8ecd48e..018fb17b7b 100644 --- a/packages/mpg321/mpg321_0.2.10.bb +++ b/packages/mpg321/mpg321_0.2.10.bb @@ -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 " 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 -- 2.39.5