xqtlauncher: removed xqtlauncher-xkbd-desktop and updated task-xqtlauncher to fit...

diff --git a/packages/tasks/task-xqtlauncher.bb b/packages/tasks/task-xqtlauncher.bb
index 3d9029e..690d0df 100644 (file)
--- a/packages/tasks/task-xqtlauncher.bb
+++ b/packages/tasks/task-xqtlauncher.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Tasks for xqtlauncher stuff"\r
 SECTION = "opie/base"\r
 LICENSE = "MIT"\r
-PR = "r0"\r
+PR = "r1"\r
 \r
 inherit task\r
 \r
@@ -9,8 +9,8 @@ PACKAGES = "task-xqtlauncher task-xqtlauncher-blackbox"
 \r
 #xkbd is currently needed becuse of a bug at xqt2\r
 RDEPENDS_task-xqtlauncher = "xqtlauncher \\r
-                             xqtlauncher-xkbd-desktop \\r
-                            "\r
+                                                   xkbd \\r
+                                                   "\r
 \r
 #\r
 # xqtlauncher with blackbox as wm\r

diff --git a/packages/xqtlauncher/xqtlauncher-xkbd-desktop.bb b/packages/xqtlauncher/xqtlauncher-xkbd-desktop.bb
deleted file mode 100644 (file)
index 17ba103..0000000
--- 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 (file)
index 78decbf..0000000
--- 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