[oe-commits] Klaus Kurzmann : mokonnect_svn.bb: remove obsolete . desktop and install into /usr/share/mokonnect

[git version control]

Module: openembedded.git
Branch: shr/import
Commit: 6f64f28a4a835f33318d90ca26e2d048283fee2d
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=6f64f28a4a835f33318d90ca26e2d048283fee2d

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Sun Jul 12 09:29:58 2009 +0200

mokonnect_svn.bb: remove obsolete .desktop and install into /usr/share/mokonnect

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 recipes/connman/mokonnect/mokonnect.desktop |   13 ----------
 recipes/connman/mokonnect_svn.bb            |   35 ++++++++++++--------------
 2 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/recipes/connman/mokonnect/mokonnect.desktop b/recipes/connman/mokonnect/mokonnect.desktop
deleted file mode 100644
index 0f24087..0000000
--- a/recipes/connman/mokonnect/mokonnect.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=Mokonnect
-TryExec=/usr/bin/mokonnect.py
-GenericName=Mokonnect
-Comment=Connection Manager for Openmoko Phone
-StartupNotify=true
-Exec=/usr/bin/mokonnect.py
-Terminal=false
-Type=Application
-Categories=Settings;
-Icon=mokonnect.png
diff --git a/recipes/connman/mokonnect_svn.bb b/recipes/connman/mokonnect_svn.bb
index 1daf575..dd518d0 100644
--- a/recipes/connman/mokonnect_svn.bb
+++ b/recipes/connman/mokonnect_svn.bb
@@ -6,37 +6,34 @@ SECTION = "e/apps"
 RDEPENDS = "python-elementary"
 
 PV = "0.2+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "svn://subversion.assembla.com/svn/shrdev;module=Mokonnect/trunk;proto=http \
-file://mokonnect.desktop"
+SRC_URI = "svn://subversion.assembla.com/svn/shrdev;module=Mokonnect/trunk;proto=http"
 
 S = "${WORKDIR}/Mokonnect/trunk"
 
-inherit distutils-base
-
-
-PY_FILES = "mkbase.py mkdev_usbnet.py mkdev_wifi.py mkmenu.py qdbus.py"
-
 do_install() {
-	install -d ${D}${libdir}
-	install -d ${D}${libdir}/${PYTHON_DIR}
-	install -d ${D}${libdir}/${PYTHON_DIR}/site-packages
-
-	for f in ${PY_FILES}
+	install -d ${D}${datadir}/mokonnect
+	for pyfile in *.py
 	do
-		install -m 0644 $f ${D}${libdir}/${PYTHON_DIR}/site-packages/
+		install -m 644 $pyfile ${D}${datadir}/mokonnect/
 	done
-
-	install -d ${D}${bindir}
-	install -m 755 mokonnect.py ${D}${bindir}/
+	chmod 755 ${D}${datadir}/mokonnect/mokonnect.py
 
 	install -d ${D}${datadir}/applications
-	install -m 644 ${WORKDIR}/mokonnect.desktop ${D}${datadir}/applications/
+	install -m 644 mokonnect.desktop ${D}${datadir}/applications/
 
 	install -d ${D}${datadir}/pixmaps
 	install -m 644 mokonnect.png ${D}${datadir}/pixmaps/
+
+	install -d ${D}${bindir}
+	ln -sf ${datadir}/mokonnect/mokonnect.py ${D}${bindir}/mokonnect
 }
 
-FILES_${PN} += " ${datadir}/*/*"
+FILES_${PN} = "\
+${datadir}/mokonnect \
+${datadir}/applications/* \
+${datadir}/pixmaps/* \
+${bindir}/mokonnect \
+"