Merge oe-devel@oe-devel.bkbits.net:packages

[openembedded.git] / opie-mediaplayer1 / opie-mediaplayer1_1.1.7.oe

diff --git a/opie-mediaplayer1/opie-mediaplayer1_1.1.7.oe b/opie-mediaplayer1/opie-mediaplayer1_1.1.7.oe
index d279dc8..517e9c0 100644 (file)
--- a/opie-mediaplayer1/opie-mediaplayer1_1.1.7.oe
+++ b/opie-mediaplayer1/opie-mediaplayer1_1.1.7.oe
@@ -2,17 +2,19 @@ DESCRIPTION = "The classic Opie media player"
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
+DEPENDS = "opie-mediaplayer2-skin-default"
+RDEPENDS = "opie-mediaplayer2-skin-default"
 RRECOMMENDS = "opie-mediaplayer1-libmadplugin opie-mediaplayer1-libwavplugin \
 opie-mediaplayer1-libmodplugin opie-mediaplayer1-libtremorplugin"
-PR = "r1"
+PR = "r2"
 
 APPNAME = "opieplayer"
 APPTYPE = "binary"
 
 TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/core/multimedia/opieplayer \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
@@ -21,8 +23,6 @@ inherit opie
 # FILES bin/opieplayer pics/opieplayer apps/Applications/opieplayer.desktop
 do_install() {
         install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/default/
-        install -d ${D}${palmtopdir}/pics/${APPNAME}2/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}2/skins/default/
 }