From 7114a28884877c4e5e6b9fd983cfd1a84ff77b91 Mon Sep 17 00:00:00 2001
From: Michael Mrozek <EvilDragon@openpandora.de>
Date: Tue, 21 Jun 2011 23:55:20 +0200
Subject: [PATCH] pandora-pndstore: Updated to latest version, changed
 installation path to /usr/bin

---
 recipes/pandora-system/pandora-pndstore.bb    | 42 ++++++-------------
 .../pandora-pndstore/op_pndstore.desktop      |  2 +-
 2 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/recipes/pandora-system/pandora-pndstore.bb b/recipes/pandora-system/pandora-pndstore.bb
index 4d4f9a5..e290ccf 100755
--- a/recipes/pandora-system/pandora-pndstore.bb
+++ b/recipes/pandora-system/pandora-pndstore.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Download and upgrade PND packages."
 LICENSE = "LGPL"
 
-PR = "r7"
+PR = "r8"
 
 SRC_URI = " \
           git://github.com/Tempel/PNDstore.git;protocol=git;branch=master \
@@ -13,37 +13,19 @@ SRCREV = "4c8a5ccf084c06994f50"
 
 S = "${WORKDIR}/git"
 
-do_install() {
-          install -d ${D}${prefix}/pandora/scripts/pndstore/
-          install -m 0775 ${S}/PNDstore ${D}${prefix}/pandora/scripts/pndstore/PNDstore
-	  install -m 0775 ${S}/pndst ${D}${prefix}/pandora/scripts/pndstore/pndst
-	  install -m 0644 ${S}/README.rst ${D}${prefix}/pandora/scripts/pndstore/README.rst
-	  
-	   install -d ${D}$/usr/lib/python2.6/lib-dynload/
-	  install -m 0644 ${WORKDIR}/_ctypes.so ${D}/usr/lib/python2.6/lib-dynload/_ctypes.so
-
-	  install -d ${D}${prefix}/pandora/scripts/pndstore/pndstore_gui 
-	  install -m 0775 ${S}/pndstore_gui/PNDstore.glade ${D}${prefix}/pandora/scripts/pndstore/pndstore_gui/PNDstore.glade
-	  install -m 0775 ${S}/pndstore_gui/__init__.py ${D}${prefix}/pandora/scripts/pndstore/pndstore_gui/__init__.py
-	    
-	  install -d ${D}${prefix}/pandora/scripts/pndstore/pndstore_core
-	  install -m 0775 ${S}/pndstore_core/__init__.py ${D}${prefix}/pandora/scripts/pndstore/pndstore_core/__init__.py
-	  install -m 0775 ${S}/pndstore_core/database_update.py ${D}${prefix}/pandora/scripts/pndstore/pndstore_core/database_update.py
-	  install -m 0775 ${S}/pndstore_core/libpnd.py ${D}${prefix}/pandora/scripts/pndstore/pndstore_core/libpnd.py
-	  install -m 0775 ${S}/pndstore_core/options.py ${D}${prefix}/pandora/scripts/pndstore/pndstore_core/options.py
-	  install -m 0775 ${S}/pndstore_core/packages.py ${D}${prefix}/pandora/scripts/pndstore/pndstore_core/packages.py
-
-	  install -d ${D}${prefix}/pandora/scripts/pndstore/pndstore_core/cfg
-	  install -m 0775 ${S}/pndstore_core/cfg/default.cfg ${D}${prefix}/pandora/scripts/pndstore/pndstore_core/cfg/default.cfg
-
-	  install -d ${D}${datadir}/applications/
-          install -m 0644 ${WORKDIR}/op_pndstore.desktop ${D}${datadir}/applications/
-
-	  install -d ${D}${datadir}/pixmaps/
-	  install -m 0644 ${S}/resources/icon.png ${D}${datadir}/pixmaps/op_pndstore.png
+inherit distutils
+
+do_install_append() {
+
+      # A stop-gap fix to the ctypes bug.
+      # This can be removed once the python-ctypes package is made to behave correctly.
+      install -Dm 0644 ${WORKDIR}/_ctypes.so ${D}/usr/lib/python2.6/lib-dynload/_ctypes.so
+        
+      install -Dm 0644 ${WORKDIR}/op_pndstore.desktop ${D}${datadir}/applications/op_pndstore.desktop 
+      install -Dm 0644 ${S}/resources/icon.png ${D}${datadir}/pixmaps/op_pndstore.png
 
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-FILES_${PN} += "${prefix} ${datadir}"
\ No newline at end of file
+FILES_${PN} += "${prefix} ${datadir}"
diff --git a/recipes/pandora-system/pandora-pndstore/op_pndstore.desktop b/recipes/pandora-system/pandora-pndstore/op_pndstore.desktop
index f27b22d..d943b73 100644
--- a/recipes/pandora-system/pandora-pndstore/op_pndstore.desktop
+++ b/recipes/pandora-system/pandora-pndstore/op_pndstore.desktop
@@ -2,7 +2,7 @@
 Name=PNDstore
 Comment=Download and update software for your Pandora.
 StartupNotify=false
-Exec=python /usr/pandora/scripts/pndstore/PNDstore
+Exec=python /usr/bin/PNDstore
 Icon=/usr/share/pixmaps/op_pndstore.png
 Terminal=false
 Type=Application
-- 
2.39.2