X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=blobdiff_plain;f=recipes%2Fpandora-system%2Fpandora-scripts.bb;h=7cc4a675d61e7b58fdcc0ecf4b20ab8d93a7876d;hp=38eb779ced6b34dd7dfb1d2055528834315d3459;hb=0257fcc346f0410ca73d2e82c641ad74b047d596;hpb=88a19b9a6f624798759c155d0a89793cab16e988

diff --git a/recipes/pandora-system/pandora-scripts.bb b/recipes/pandora-system/pandora-scripts.bb
index 38eb779..7cc4a67 100644
--- a/recipes/pandora-system/pandora-scripts.bb
+++ b/recipes/pandora-system/pandora-scripts.bb
@@ -6,16 +6,14 @@ COMPATIBLE_MACHINE = "omap3-pandora"
 DEPENDS = "zenity dbus"
 RDEPENDS = "zenity dbus"
 
-PR = "r41"
+PR = "r48"
 
 SRC_URI = " \
           file://op_bright.sh \
-#	   file://op_bright.desktop \
           file://op_cpuspeed.sh \
           file://op_cpuspeed.pnd \          
           file://op_wifi.sh \
           file://op_wifi.pnd \  
-#	  file://op_wifi.desktop \ 
           file://op_bluetooth.sh \
           file://op_bluetooth-check.desktop \
           file://op_bluetooth.desktop \          
@@ -41,26 +39,19 @@ SRC_URI = " \
 	  file://op_storage.pnd \
           file://op_nubmode.sh \
 	  file://op_nubmode.pnd \
+          file://op_tvout.sh \
+	  file://op_tvout.pnd \
           file://gui.conf \
           file://gamma.conf \
           file://service.conf \
-          file://default_up_h \
-          file://default_up_v3 \
-          file://default_up_v5 \
-          file://none_up_h \
-          file://none_up_v3 \
-          file://none_up_v5 \
+          file://default_up \
+          file://none_up \
           file://op_env.sh \
-#          file://pandorascripts.pnd \
-	  file://abiword.pnd \
           file://arora.pnd \
-          file://claws-mail.pnd \
           file://evince.pnd \
           file://gigolo.pnd \
-          file://gnumeric.pnd \
           file://midori.pnd \
           file://mousepad.pnd \
-          file://pidgin.pnd \
           file://ristretto.pnd \
           file://squeeze.pnd \
           file://thunar.pnd \
@@ -83,6 +74,7 @@ do_install() {
           install -m 0755 ${WORKDIR}/op_videofir.sh ${D}${prefix}/pandora/scripts/
 	  install -m 0755 ${WORKDIR}/op_nubmode.sh ${D}${prefix}/pandora/scripts/
 	  install -m 0755 ${WORKDIR}/op_storage.sh ${D}${prefix}/pandora/scripts/
+          install -m 0755 ${WORKDIR}/op_tvout.sh ${D}${prefix}/pandora/scripts/
 
           install -d ${D}${prefix}/pandora/apps/
           install -m 0755 ${WORKDIR}/op_calibrate.pnd ${D}${prefix}/pandora/apps/
@@ -95,6 +87,7 @@ do_install() {
 	  install -m 0755 ${WORKDIR}/op_switchgui.pnd ${D}${prefix}/pandora/apps/
 	  install -m 0755 ${WORKDIR}/op_usermanager.pnd ${D}${prefix}/pandora/apps/
 	  install -m 0755 ${WORKDIR}/op_wifi.pnd ${D}${prefix}/pandora/apps/
+          install -m 0755 ${WORKDIR}/op_tvout.pnd ${D}${prefix}/pandora/apps/
 
 	  install -d ${D}${prefix}/pandora/mmenu/
           install -m 0755 ${WORKDIR}/abiword.pnd ${D}${prefix}/pandora/mmenu/
@@ -112,17 +105,7 @@ do_install() {
           install -m 0755 ${WORKDIR}/xchat.pnd ${D}${prefix}/pandora/mmenu/
 
           install -d ${D}${datadir}/applications/
-#	  install -m 0644 ${WORKDIR}/op_bright.desktop ${D}${datadir}/applications/
-#          install -m 0644 ${WORKDIR}/op_cpuspeed.desktop ${D}${datadir}/applications/
-#          install -m 0644 ${WORKDIR}/op_wifi.desktop ${D}${datadir}/applications/
           install -m 0644 ${WORKDIR}/op_bluetooth.desktop ${D}${datadir}/applications/
-#          install -m 0644 ${WORKDIR}/op_startupmanager.desktop ${D}${datadir}/applications/
-#          install -m 0644 ${WORKDIR}/op_switchgui.desktop ${D}${datadir}/applications/          
-#          install -m 0644 ${WORKDIR}/op_calibrate.desktop ${D}${datadir}/applications/
-#          install -m 0644 ${WORKDIR}/op_datetime.desktop ${D}${datadir}/applications/
-#          install -m 0644 ${WORKDIR}/op_usermanager.desktop ${D}${datadir}/applications/
-#          install -m 0644 ${WORKDIR}/op_lcdsettings.desktop ${D}${datadir}/applications/
-#	  install -m 0644 ${WORKDIR}/op_nubmode.desktop ${D}${datadir}/applications/
           
           install -d ${D}${sysconfdir}/xdg/autostart/
           install -m 0644 ${WORKDIR}/op_bluetooth-check.desktop ${D}${sysconfdir}/xdg/autostart/op_bluetooth-check.desktop
@@ -133,12 +116,8 @@ do_install() {
           install -m 0644 ${WORKDIR}/service.conf ${D}${sysconfdir}/pandora/conf/service.conf
 
           install -d ${D}${sysconfdir}/pandora/conf/dss_fir/
-          install -m 0644 ${WORKDIR}/default_up_h ${D}${sysconfdir}/pandora/conf/dss_fir/
-          install -m 0644 ${WORKDIR}/default_up_v3 ${D}${sysconfdir}/pandora/conf/dss_fir/
-          install -m 0644 ${WORKDIR}/default_up_v5 ${D}${sysconfdir}/pandora/conf/dss_fir/
-          install -m 0644 ${WORKDIR}/none_up_h ${D}${sysconfdir}/pandora/conf/dss_fir/
-          install -m 0644 ${WORKDIR}/none_up_v3 ${D}${sysconfdir}/pandora/conf/dss_fir/
-          install -m 0644 ${WORKDIR}/none_up_v5 ${D}${sysconfdir}/pandora/conf/dss_fir/
+          install -m 0644 ${WORKDIR}/default_up ${D}${sysconfdir}/pandora/conf/dss_fir/
+          install -m 0644 ${WORKDIR}/none_up ${D}${sysconfdir}/pandora/conf/dss_fir/
 
           install -d ${D}${sysconfdir}/profile.d/
           install -m 0755 ${WORKDIR}/op_env.sh ${D}${sysconfdir}/profile.d/