opie-mediaplayer1: Finish refactor to get rid of circular dependencies.

diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1-core.inc b/packages/opie-mediaplayer1/opie-mediaplayer1-core.inc
index 7c20be5..de9ea19 100644 (file)
--- a/packages/opie-mediaplayer1/opie-mediaplayer1-core.inc
+++ b/packages/opie-mediaplayer1/opie-mediaplayer1-core.inc
@@ -1,11 +1,9 @@
-DESCRIPTION = "The classic Opie media player"
+DESCRIPTION = "The classic Opie media player (core)"
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "libqtaux2"
 RDEPENDS = "opie-mediaplayer2-skin-default"
-RRECOMMENDS = "opie-mediaplayer1-libmadplugin opie-mediaplayer1-libwavplugin \
-opie-mediaplayer1-libmodplugin opie-mediaplayer1-libtremorplugin"
 APPNAME = "opieplayer"
 APPTYPE = "binary"
 

diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb
index 5f1f6b0..0ceaac4 100644 (file)
--- a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb
+++ b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb
@@ -1,7 +1,10 @@
-DESCRIPTION = "OPIE Mediaplayer1 OGG+MP3 pseudo package."
+DESCRIPTION = "The classic Opie media player (core+plugins)."
 LICENSE = "GPL"
 ALLOW_EMPTY = "1"
 PACKAGES = "${PN}"
 PACKAGE_ARCH = "all"
-RDEPENDS = "opie-mediaplayer1 opie-mediaplayer1-libtremorplugin opie-mediaplayer1-libmadplugin"
-PR = "r1"
+RDEPENDS = "opie-mediaplayer1-core"
+RRECOMMENDS = "opie-mediaplayer1-libmadplugin opie-mediaplayer1-libwavplugin \
+opie-mediaplayer1-libmodplugin opie-mediaplayer1-libtremorplugin"
+
+PR = "r2"