From a633365b0f23b8f9baa551c0c02e6ce4d96ee9c7 Mon Sep 17 00:00:00 2001
From: Bernhard Guillon <Bernhard.Guillon@opensimpad.org>
Date: Sat, 6 Dec 2008 20:01:13 +0100
Subject: xqtlauncher: removed xqtlauncher-xkbd-desktop and updated
 task-xqtlauncher to fit the change

---
 packages/tasks/task-xqtlauncher.bb                    |  6 +++---
 packages/xqtlauncher/xqtlauncher-xkbd-desktop.bb      | 19 -------------------
 .../xqtlauncher/xqtlauncher-xkbd-desktop/xkbd.desktop |  5 -----
 3 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 packages/xqtlauncher/xqtlauncher-xkbd-desktop.bb
 delete mode 100644 packages/xqtlauncher/xqtlauncher-xkbd-desktop/xkbd.desktop

(limited to 'packages')

diff --git a/packages/tasks/task-xqtlauncher.bb b/packages/tasks/task-xqtlauncher.bb
index 3d9029e5d1..690d0dfd19 100644
--- a/packages/tasks/task-xqtlauncher.bb
+++ b/packages/tasks/task-xqtlauncher.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Tasks for xqtlauncher stuff"
 SECTION = "opie/base"
 LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
 
 inherit task
 
@@ -9,8 +9,8 @@ PACKAGES = "task-xqtlauncher task-xqtlauncher-blackbox"
 
 #xkbd is currently needed becuse of a bug at xqt2
 RDEPENDS_task-xqtlauncher = "xqtlauncher \
-                             xqtlauncher-xkbd-desktop \
-                            "
+                                                   xkbd \
+                                                   "
 
 #
 # xqtlauncher with blackbox as wm
diff --git a/packages/xqtlauncher/xqtlauncher-xkbd-desktop.bb b/packages/xqtlauncher/xqtlauncher-xkbd-desktop.bb
deleted file mode 100644
index 17ba103d20..0000000000
--- a/packages/xqtlauncher/xqtlauncher-xkbd-desktop.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "xqtlauncher integrates X/Qt2 nicely into opie. You can launch applications with it from opies menue"
-HOMEPAGE = "http://angstrom-distribution.org/"
-LICENSE = "GPL"
-PR = "r0"
-
-RDEPENDS = "xkbd xqtlauncher"
-
-SRC_URI = "file://xkbd.desktop"
-        
-do_install() {
-	cd ${WORKDIR}
-	install -d ${D}${bindir}
-	install -d ${D}${palmtopdir}/apps/XQt2/
-	install -m 0644 xkbd.desktop ${D}${palmtopdir}/apps/XQt2
-	ln -sf   ${bindir}/xqtlauncher  ${D}${bindir}/runxkbd
-}
-
-FILES_${PN} += "${palmtopdir}/apps/XQt2 \
-	${palmtopdir}/apps/XQt2/xkbd.desktop "
diff --git a/packages/xqtlauncher/xqtlauncher-xkbd-desktop/xkbd.desktop b/packages/xqtlauncher/xqtlauncher-xkbd-desktop/xkbd.desktop
deleted file mode 100644
index 78decbfda0..0000000000
--- a/packages/xqtlauncher/xqtlauncher-xkbd-desktop/xkbd.desktop
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Exec=runxkbd xkbd
-Icon=Xqt.png
-Type=Application
-Name=X/Qt2 with xkbd
-- 
cgit v1.2.3