diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2009-01-13 21:53:15 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2009-01-13 21:53:28 +0100 |
| commit | ec69feaa65584be3e6975ef53dbd722810f238d9 (patch) | |
| tree | 86f2afb51f4452f6c373b52fd903769cf4696299 | |
| parent | b28d85970c5f0c718a18e92d3d58e480c36e239d (diff) | |
mpg321/mpg123: let only main package conflict
| -rw-r--r-- | packages/mpg123/mpg123_0.66.bb | 5 | ||||
| -rw-r--r-- | packages/mpg321/mpg321_0.2.10.bb | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/packages/mpg123/mpg123_0.66.bb b/packages/mpg123/mpg123_0.66.bb index a92cf877a9..f766f930dc 100644 --- a/packages/mpg123/mpg123_0.66.bb +++ b/packages/mpg123/mpg123_0.66.bb @@ -3,8 +3,9 @@ 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" +RCONFLICTS_${PN} = "mpg321" +RREPLACES_${PN} = "mpg321" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/mpg123/mpg123-${PV}.tar.bz2" diff --git a/packages/mpg321/mpg321_0.2.10.bb b/packages/mpg321/mpg321_0.2.10.bb index 018fb17b7b..cdbbd521d5 100644 --- a/packages/mpg321/mpg321_0.2.10.bb +++ b/packages/mpg321/mpg321_0.2.10.bb @@ -4,8 +4,9 @@ DEPENDS = "libmad libao" LICENSE = "GPL" AUTHOR = "Joe Drew <hoserhead@woot.net>" HOMEPAGE = "http://mpg321.sourceforge.net/" -RCONFLICTS = "mpg123" -RREPLACES = "mpg123" +RCONFLICTS_${PN} = "mpg123" +RREPLACES_${PN} = "mpg123" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/mpg321/mpg321-0.2.10.tar.gz \ file://libao.m4.patch;patch=1" |