fix description and simplify cumulus.oe

BKrev: 41509a08rHDirDilJXawmv_lgse2og

diff --git a/cumulus/cumulus-1.1/qtooltip.patch b/cumulus/cumulus-1.1/qtooltip.patch
index e69de29..b36b967 100644 (file)
--- a/cumulus/cumulus-1.1/qtooltip.patch
+++ b/cumulus/cumulus-1.1/qtooltip.patch
@@ -0,0 +1,27 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- cumulus/whatsthat.cpp~qtooltip     2004-01-24 12:00:59.000000000 +0100
++++ cumulus/whatsthat.cpp      2004-01-29 19:30:04.000000000 +0100
+@@ -16,7 +16,7 @@
+ ***********************************************************************/
+ 
+ #include "whatsthat.h"
+-#include <qtooltip.h>
++#include "./qtooltip.h"
+ #include <qstylesheet.h>
+ #include <qapplication.h>
+ #include <qpainter.h>
+--- cumulus/qtooltip.h~qtooltip        2004-01-24 12:01:00.000000000 +0100
++++ cumulus/qtooltip.h 2004-01-29 19:31:16.000000000 +0100
+@@ -43,7 +43,7 @@
+ public: 
+       QToolTip(){};
+       ~QToolTip(){};
+-  QPalette palette();
++  static QPalette palette();
+ };
+ 
+ #endif

diff --git a/cumulus/cumulus_1.1.oe b/cumulus/cumulus_1.1.oe
index 4560e02..fca4a64 100644 (file)
--- a/cumulus/cumulus_1.1.oe
+++ b/cumulus/cumulus_1.1.oe
@@ -1,29 +1,24 @@
-DESCRIPTION = "OpenOffice.org Impress presentation viewer for Qt/E based Palmtop environments"
-SECTION = "base"
+DESCRIPTION = "A flightcomputer application for Qt/E based Palmtop Environments"
+SECTION = "opie/applications"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "virtual/libqpe"
+APPTYPE = "binary"
+APPNAME = "cumulus"
+APPDESKTOP = "${S}"
+PR = "r1"
 
 SRC_URI = "http://cumulus.kflog.org/download/src/cumulus-${PV}.src.tar.bz2 \
            file://qtooltip.patch;patch=1"
-S = "${WORKDIR}/cumulus-arm-${PV}"
+S = "${WORKDIR}/cumulus-arm-${PV}/cumulus"
 
-inherit palmtop
+inherit opie
 
 EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=-I."
 
-do_configure_prepend() {
-        echo -e "TEMPLATE=subdirs\nSUBDIRS=cumulus\n" >cumulus.pro
-}
-
 do_install() {
-        install -d ${D}/${palmtopdir}/bin \
-                  ${D}/${palmtopdir}/apps/Applications \
-                  ${D}/${palmtopdir}/pics
-        install -D -m 0755 cumulus/cumulus ${D}/${palmtopdir}/bin/cumulus
-        install -D -m 0644 cumulus/cumulus.desktop ${D}/${palmtopdir}/Applications/cumulus.desktop
-        install -D -m 0644 cumulus.png ${D}/${palmtopdir}/pics/cumulus.png
         install -d ${D}/${palmtopdir}/pics/mapicons
-        cp -a cumulus/map-icons/* ${D}/${palmtopdir}/pics/mapicons
+        install -m 0644 ../cumulus.png ${D}/${palmtopdir}/pics/cumulus.png
+        cp -a map-icons/* ${D}/${palmtopdir}/pics/mapicons
 }