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=56c398bc8eab9f97627895235377e701afb9ad0c;hp=46fcffc7d2df9c840178878e9a8a62873362ab5a;hb=2df1bc52f0a0d42da59c980b00635c76d890732a;hpb=7e0f19451b031eb03bf263bcc2d676ee8de59797

diff --git a/recipes/pandora-system/pandora-scripts.bb b/recipes/pandora-system/pandora-scripts.bb
index 46fcffc..56c398b 100644
--- a/recipes/pandora-system/pandora-scripts.bb
+++ b/recipes/pandora-system/pandora-scripts.bb
@@ -6,36 +6,40 @@ COMPATIBLE_MACHINE = "omap3-pandora"
 DEPENDS = "zenity dbus"
 RDEPENDS = "zenity dbus"
 
-PR = "r15"
+PR = "r23"
 
 SRC_URI = " \
           file://op_bright.sh \
+#	   file://op_bright.desktop \
           file://op_cpuspeed.sh \
-          file://op_cpuspeed.desktop \          
+#          file://op_cpuspeed.desktop \          
           file://op_wifi.sh \
           file://op_wifi.desktop \          
           file://op_bluetooth.sh \
           file://op_bluetooth-check.desktop \
           file://op_bluetooth.desktop \          
-          file://op_defaultgui.sh \
-          file://op_defaultgui.desktop \
+          file://op_startupmanager.sh \
+#          file://op_startupmanager.desktop \
           file://op_switchgui.sh \
-          file://op_switchgui.desktop \
+#          file://op_switchgui.desktop \
           file://startnetbooklauncher \
-          file://startmmenu \          
+          file://startmmenu \    
+          file://startpmenu \ 
+          file://stopmmenu
           file://op_calibrate.sh \
-          file://op_calibrate.desktop \
+#          file://op_calibrate.desktop \
           file://op_datetime.sh \
-          file://op_datetime.desktop \
-	  file://op_usermanager.sh \
-          file://op_usermanager.desktop \
-          file://op_gammamanager.sh \
-          file://op_gammamanager.desktop \
-	  file://op_nubmode.sh \
-	  file://op_nubmode.desktop \
+#          file://op_datetime.desktop \
+          file://op_usermanager.sh \
+#          file://op_usermanager.desktop \
+          file://op_lcdsettings.sh \
+#          file://op_lcdsettings.desktop \
+          file://op_nubmode.sh \
+#	  file://op_nubmode.desktop \
           file://gui.conf \
           file://gamma.conf \
-	  file://op_env.sh \
+          file://op_env.sh \
+          file://pandorascripts.pnd \
 "
 
 do_install() {
@@ -44,26 +48,29 @@ do_install() {
           install -m 0755 ${WORKDIR}/op_cpuspeed.sh ${D}${prefix}/pandora/scripts/
           install -m 0755 ${WORKDIR}/op_wifi.sh ${D}${prefix}/pandora/scripts/
           install -m 0755 ${WORKDIR}/op_bluetooth.sh ${D}${prefix}/pandora/scripts/
-          install -m 0755 ${WORKDIR}/op_defaultgui.sh ${D}${prefix}/pandora/scripts/
+          install -m 0755 ${WORKDIR}/op_startupmanager.sh ${D}${prefix}/pandora/scripts/
           install -m 0755 ${WORKDIR}/op_switchgui.sh ${D}${prefix}/pandora/scripts/
           install -m 0755 ${WORKDIR}/op_calibrate.sh ${D}${prefix}/pandora/scripts/
           install -m 0755 ${WORKDIR}/op_datetime.sh ${D}${prefix}/pandora/scripts/
 	  install -m 0755 ${WORKDIR}/op_usermanager.sh ${D}${prefix}/pandora/scripts/
-          install -m 0755 ${WORKDIR}/op_gammamanager.sh ${D}${prefix}/pandora/scripts/
+          install -m 0755 ${WORKDIR}/op_lcdsettings.sh ${D}${prefix}/pandora/scripts/
 	  install -m 0755 ${WORKDIR}/op_nubmode.sh ${D}${prefix}/pandora/scripts/
-          
+
+          install -d ${D}${prefix}/pandora/apps/
+          install -m 0755 ${WORKDIR}/pandorascripts.pnd ${D}${prefix}/pandora/apps/
+
           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_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_defaultgui.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_gammamanager.desktop ${D}${datadir}/applications/
-	  install -m 0644 ${WORKDIR}/op_nubmode.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
@@ -71,13 +78,15 @@ do_install() {
           install -d ${D}${sysconfdir}/pandora/conf/
           install -m 0644 ${WORKDIR}/gui.conf ${D}${sysconfdir}/pandora/conf/gui.conf
           install -m 0644 ${WORKDIR}/gamma.conf ${D}${sysconfdir}/pandora/conf/gamma.conf
-	
-	  install -d ${D}${sysconfdir}/profile.d/
-	  install -m 0755 ${WORKDIR}/op_env.sh {D}${sysconfdir}/profile.d/
+
+          install -d ${D}${sysconfdir}/profile.d/
+          install -m 0755 ${WORKDIR}/op_env.sh ${D}${sysconfdir}/profile.d/
 
           install -d ${D}${bindir}/
           install -m 0755 ${WORKDIR}/startnetbooklauncher ${D}${bindir}/
           install -m 0755 ${WORKDIR}/startmmenu ${D}${bindir}/
+          install -m 0755 ${WORKDIR}/startpmenu ${D}${bindir}/
+          install -m 0755 ${WORKDIR}/stopmmenu ${D}${bindir}/
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"