merge of 61aa408f3a01fffc55bb2aa59c4801f8c68ec695

     and bf6be0792ee7f592df6a7940fb7b0bf86f833157

5 files changed, 59 insertions, 14 deletions

diff --git a/packages/bochs/bochs_2.1.bb b/packages/bochs/bochs_2.1.bb
index a9aed3a08c..1ae3a23314 100644
--- a/packages/bochs/bochs_2.1.bb
+++ b/packages/bochs/bochs_2.1.bb
@@ -1,13 +1,17 @@
-DESCRIPTION = "x86 Emulator based on SDL"
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = "libsdl-qpe"
+DESCRIPTION = "An x86 Emulator based on SDL."
+HOMEPAGE = "http://bochs.sf.net"
 LICENSE = "GPL"
+PR = "r1"
+
+# needs a patch for recent g++
+BROKEN = "1"
+
+APPIMAGE = "doc/docbook/images/dlxlinux-in-linux.png"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bochs/bochs-${PV}.tar.gz \
            file://compile.patch;patch=1"
 
-inherit autotools 
+inherit autotools sdl
 
 EXTRA_OECONF = "--without-x                 \
                 --without-x11               \
diff --git a/packages/meta/task-qpe.bb b/packages/meta/task-qpe.bb
index d76c2d6366..5c27d9e6db 100644
--- a/packages/meta/task-qpe.bb
+++ b/packages/meta/task-qpe.bb
@@ -1,9 +1,9 @@
-DESCRIPTION = "Tasks for QPE stuff"
+DESCRIPTION = "Tasks for programs running on Qt/Embedded based Palmtop Environents like Opie and Qtopia."
 SECTION = "opie/base"
 ALLOW_EMPTY = 1
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
-PR = "r2"
+PR = "r3"
 
 PACKAGES = "task-qpe-applets task-qpe-games task-qpe-inputmethods \
 	task-qpe-multimedia task-qpe-emulators task-qpe-applications \
@@ -39,6 +39,7 @@ RDEPENDS_task-qpe-applications = "\
     qplot \
     resistorui \
     shopper \
+    sliderulez \
     timesleuth \
     txdrug \
     tximage \
diff --git a/packages/openttd/openttd_0.4.0.1.bb b/packages/openttd/openttd_0.4.0.1.bb
index 74d3fc0e7f..998fbc0ef7 100644
--- a/packages/openttd/openttd_0.4.0.1.bb
+++ b/packages/openttd/openttd_0.4.0.1.bb
@@ -1,13 +1,27 @@
-DESCRIPTION = "Open source clone of the Microprose game 'Transport Tycoon Deluxe'"
-SECTION = "games"
-DEPENDS = "virtual/libsdl"
+DESCRIPTION = "Open source clone of the Microprose game 'Transport Tycoon Deluxe' - SDL edition."
+HOMEPAGE = "http://openttd.sf.net"
+LICENSE = "GPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openttd/openttd-${PV}-source.tar.gz"
 
-EXTRA_OEMAKE = "WITH_ZLIB=1 WITH_PNG=1 WITH_SDL=1 UNIX=1 \
-WITH_NETWORK=1 VERBOSE=1 INSTALL=1 \
-PREFIX=usr BINARY_DIR=bin DATA_DIR=share/games/openttd PERSONAL_DIR=.openttd USE_HOMEDIR=1 \
-CC_HOST=gcc CC_TARGET=${TARGET_SYS}-gcc"
+APPIMAGE = "media/openttd.48.png"
+
+EXTRA_OEMAKE = "WITH_ZLIB=1 \
+		WITH_PNG=1 \
+		WITH_SDL=1 \
+		UNIX=1 \
+		WITH_NETWORK=1 \
+		VERBOSE=1 \
+		INSTALL=1 \
+		PREFIX=usr \
+		BINARY_DIR=bin \
+		DATA_DIR=share/games/openttd \
+		PERSONAL_DIR=.openttd \
+		USE_HOMEDIR=1 \
+		CC_HOST=gcc \
+		CC_TARGET=${TARGET_SYS}-gcc"
+
+inherit sdl
 
 do_install() {
     oe_runmake install DESTDIR="${D}"
diff --git a/packages/sliderulez/.mtn2git_empty b/packages/sliderulez/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sliderulez/.mtn2git_empty
diff --git a/packages/sliderulez/sliderulez_0.92.bb b/packages/sliderulez/sliderulez_0.92.bb
new file mode 100644
index 0000000000..e9bb9e096b
--- /dev/null
+++ b/packages/sliderulez/sliderulez_0.92.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Sliderulez is an advanced RPN pocket calculator."
+HOMEPAGE = "http://www.gelhaus.net/cgi-bin/showpage.py?zaurus/+sliderulez.html"
+AUTHOR = "Matthew Gelhaus"
+SECTION = "opie/applications"
+LICENSE = "GPL"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+PR = "r0"
+
+APPTYPE = "binary"
+APPDESKTOP = "pkg/opt/QtPalmtop/apps/Applications"
+
+SRC_URI = "http://www.gelhaus.net/zaurus/sliderulez-${PV}.tar.gz"
+
+inherit opie
+
+EXTRA_QMAKEVARS_POST += "TARGET=sliderulez"
+
+do_configure_prepend() {
+	rm -rf "*.o Makefile"
+}
+
+
+do_install() {
+	install -d ${D}${palmtopdir}/pics
+	install -m 0644 pkg/opt/QtPalmtop/pics/SlideRuleZ.png ${D}${palmtopdir}/pics/
+}