Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/07/23 22:42:33+02:00 uni-frankfurt.de!mickey
use a consistent naming scheme for opie-mediaplayer1 w/ plugins

BKrev: 4101783f-BVgn-IorAOnm3ehqCQSkQ

7 files changed, 11 insertions, 34 deletions

diff --git a/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.oe b/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.oe
index 7e01a8cc1a..42e2d390ce 100644
--- a/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.oe
+++ b/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.oe
@@ -1,10 +1,10 @@
-DESCRIPTION = "MP3 file plugin for opie-mediaplayer1 using libmad"
+DESCRIPTION = "MP3 file plugin for opie-mediaplayer11 using libmad"
 SECTION = "opie/codecs"
 PRIORITY = "optional"
 MAINTAINER = "Open Embedded <oe@handhelds.org>"
 LICENSE = "GPL"
-DEPENDS = "opie-mediaplayer libmad"
-RDEPENDS = "opie-mediaplayer"
+DEPENDS = "opie-mediaplayer1 libmad"
+RDEPENDS = "opie-mediaplayer1"
 PV = "1.1.5-cvs-${CVSDATE}"
 APPNAME = "madplugin"
 
diff --git a/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.oe b/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.oe
index b1db825608..7808491228 100644
--- a/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.oe
+++ b/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.oe
@@ -2,8 +2,8 @@ DESCRIPTION = "MOD/XM/S3M/IT plugin using libmodplug"
 SECTION = "opie/codecs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "opie-mediaplayer"
-RDEPENDS = "opie-mediaplayer"
+DEPENDS = "opie-mediaplayer1"
+RDEPENDS = "opie-mediaplayer1"
 PV = "1.1.5-cvs-${CVSDATE}"
 APPNAME = "modplugin"
 
diff --git a/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.oe b/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.oe
index cef0ba3796..27cd916e48 100644
--- a/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.oe
+++ b/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.oe
@@ -2,8 +2,8 @@ DESCRIPTION = "Mpeg video file plugin using libmad"
 SECTION = "opie/codecs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "opie-mediaplayer"
-RDEPENDS = "opie-mediaplayer"
+DEPENDS = "opie-mediaplayer1"
+RDEPENDS = "opie-mediaplayer1"
 PV = "1.1.5-cvs-${CVSDATE}"
 APPNAME = "mpeg3plugin"
 
diff --git a/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.oe b/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.oe
index ca2b8f63bc..7e1305048d 100644
--- a/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.oe
+++ b/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.oe
@@ -3,8 +3,8 @@ SECTION = "opie/codecs"
 PRIORITY = "optional"
 MAINTAINER = "Open Embedded <oe@handhelds.org>"
 LICENSE = "GPL"
-DEPENDS = "opie-mediaplayer tremor"
-RDEPENDS = "opie-mediaplayer"
+DEPENDS = "opie-mediaplayer1 tremor"
+RDEPENDS = "opie-mediaplayer1"
 PV = "1.1.5-cvs-${CVSDATE}"
 APPNAME = "tremorplugin"
 
diff --git a/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.oe b/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.oe
index 46519d6bf1..40718059be 100644
--- a/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.oe
+++ b/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.oe
@@ -2,8 +2,8 @@ DESCRIPTION = "WAV file plugin"
 SECTION = "opie/codecs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "opie-mediaplayer"
-RDEPENDS = "opie-mediaplayer"
+DEPENDS = "opie-mediaplayer1"
+RDEPENDS = "opie-mediaplayer1"
 PV = "1.1.5-cvs-${CVSDATE}"
 APPNAME = "wavplugin"
 
diff --git a/opie-mediaplayer1/opie-mediaplayer1_cvs.oe b/opie-mediaplayer1/opie-mediaplayer1_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-mediaplayer1/opie-mediaplayer1_cvs.oe
diff --git a/opie-mediaplayer1/opie-mediaplayer_cvs.oe b/opie-mediaplayer1/opie-mediaplayer_cvs.oe
deleted file mode 100644
index 2e07cb64d3..0000000000
--- a/opie-mediaplayer1/opie-mediaplayer_cvs.oe
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "The classic Opie media player"
-SECTION = "opie/multimedia"
-PRIORITY = "optional"
-LICENSE = "GPL"
-PV = "1.1.5-cvs-${CVSDATE}"
-APPNAME = "opieplayer"
-APPTYPE = "binary"
-
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/multimedia/opieplayer;date=${CVSDATE} \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics;date=${CVSDATE} \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps;date=${CVSDATE}"
-
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-# FILES bin/opieplayer pics/opieplayer apps/Applications/opieplayer.desktop
-do_install() {
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/default/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/default/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/default/
-}
-