From: David-John Willis <John.Willis@Distant-earth.com>
Date: Thu, 30 Sep 2010 09:51:48 +0000 (+0100)
Subject: pandora-scripts: Clean up recipe and rename some scripts to what the recipe expects.
X-Git-Tag: sz_beta3~232
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=commitdiff_plain;h=0ffca71d47d822122c633aff788fadb30d30c694

pandora-scripts: Clean up recipe and rename some scripts to what the recipe expects.
---

diff --git a/recipes/pandora-system/pandora-scripts.bb b/recipes/pandora-system/pandora-scripts.bb
index 1ccb403..cefe9b2 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 = "r45"
+PR = "r46"
 
 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 \          
@@ -49,7 +47,6 @@ SRC_URI = " \
           file://default_up \
           file://none_up \
           file://op_env.sh \
-#          file://pandorascripts.pnd \
 	  file://abiword.pnd \
           file://arora.pnd \
           file://claws-mail.pnd \
@@ -112,17 +109,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
diff --git a/recipes/pandora-system/pandora-scripts/.directory b/recipes/pandora-system/pandora-scripts/.directory
deleted file mode 100644
index 99b259b..0000000
--- a/recipes/pandora-system/pandora-scripts/.directory
+++ /dev/null
@@ -1,4 +0,0 @@
-[Dolphin]
-AdditionalInfo=3
-Timestamp=2010,7,5,3,39,51
-ViewMode=1
diff --git a/recipes/pandora-system/pandora-scripts/default b/recipes/pandora-system/pandora-scripts/default_up
similarity index 100%
rename from recipes/pandora-system/pandora-scripts/default
rename to recipes/pandora-system/pandora-scripts/default_up
diff --git a/recipes/pandora-system/pandora-scripts/none b/recipes/pandora-system/pandora-scripts/none_up
similarity index 100%
rename from recipes/pandora-system/pandora-scripts/none
rename to recipes/pandora-system/pandora-scripts/none_up