X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=recipes%2Fpandora-system%2Fpandora-configtray.bb;h=07a00f0c23de358bc023af2b063c8b309e0ac85e;hb=97de8635383f2f2d923c8a44e633140d206a36d1;hp=54637dd470e41a34740111bb52dd47c7f00531d2;hpb=ecb37afa9a681ac6520a39b3875ce151f9689c6b;p=openpandora.oe.git

diff --git a/recipes/pandora-system/pandora-configtray.bb b/recipes/pandora-system/pandora-configtray.bb
index 54637dd..07a00f0 100755
--- a/recipes/pandora-system/pandora-configtray.bb
+++ b/recipes/pandora-system/pandora-configtray.bb
@@ -1,17 +1,25 @@
 DESCRIPTION = "A tray applet to change various Pandora-related settings"
+LICENSE = "zlib"
 
-PR = "r2"
+PR = "r14"
 
 PARALLEL_MAKE = ""
 DEPENDS = "gtk+"
+RDEPENDS_${PN}-wifi += "${PN}"
 
 inherit pkgconfig
 
 SRC_URI = " \
           git://github.com/slaeshjag/pandora-configbutton.git;protocol=git;branch=master \
+	  file://cpu.png \
+          file://tvout.png \   
+          file://usb.png \
+	  file://wifi.png \
+	  file://bt.png \
+	  file://Pandora-Configtray.desktop \
 "
 
-SRCREV = "7efce6aa82b952e1142c41c094c286115c84cae2"
+SRCREV = "4cba5ccd41f759cea7b71167d38b7d9fc336da99"
 
 S = "${WORKDIR}/git"
 
@@ -27,6 +35,18 @@ do_install() {
 	install -m 0644 ${S}/plugin/bin/tvout.so ${D}${datadir}/configbutton/
 	install -m 0644 ${S}/plugin/bin/usbhost.so ${D}${datadir}/configbutton/
 	install -m 0644 ${S}/plugin/bin/wifi.so ${D}${datadir}/configbutton/
+	install -m 0644 ${S}/plugin/bin/usbmass.so ${D}${datadir}/configbutton/
+	install -d ${D}${prefix}/share/icons/pandora/
+        install -m 0644 ${WORKDIR}/cpu.png ${D}${prefix}/share/icons/pandora/
+	install -m 0644 ${WORKDIR}/wifi.png ${D}${prefix}/share/icons/pandora/
+	install -m 0644 ${WORKDIR}/tvout.png ${D}${prefix}/share/icons/pandora/
+	install -m 0644 ${WORKDIR}/bt.png ${D}${prefix}/share/icons/pandora/
+	install -m 0644 ${WORKDIR}/usb.png ${D}${prefix}/share/icons/pandora/
+	install -d ${D}${sysconfdir}/skel/Applications/Settings/autostart/
+	install -m 0644 ${WORKDIR}/Pandora-Configtray.desktop ${D}${sysconfdir}/skel/Applications/Settings/autostart/Pandora-Configtray.desktop
 }
 
-FILES_${PN} += "${datadir}"
+PACKAGES =+ "${PN}-wifi"
+PROVIDES += "${PN}-wifi"
+FILES_${PN}-wifi = "${datadir}/configbutton/wifi.so ${datadir}/configbutton/bluetooth.so ${prefix}/share/icons/pandora/wifi.png ${prefix}/share/icons/pandora/bt.png"
+FILES_${PN} += "${prefix} ${datadir}"