added dependency on opie-mediaplayer2 default skin to opie-mediaplayer1

BKrev: 41adc56cnVpoyszW1wEu0qLgO28OrQ

diff --git a/opie-mediaplayer1/opie-mediaplayer1_1.1.7.oe b/opie-mediaplayer1/opie-mediaplayer1_1.1.7.oe
index ddd1252..517e9c0 100644 (file)
--- a/opie-mediaplayer1/opie-mediaplayer1_1.1.7.oe
+++ b/opie-mediaplayer1/opie-mediaplayer1_1.1.7.oe
@@ -2,9 +2,11 @@ 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"
@@ -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/
 }
 

diff --git a/opie-mediaplayer1/opie-mediaplayer1_cvs.oe b/opie-mediaplayer1/opie-mediaplayer1_cvs.oe
index d393f4c..96f62a9 100644 (file)
--- a/opie-mediaplayer1/opie-mediaplayer1_cvs.oe
+++ b/opie-mediaplayer1/opie-mediaplayer1_cvs.oe
@@ -2,9 +2,11 @@ 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"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "opieplayer"
 APPTYPE = "binary"
@@ -20,8 +22,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/
 }