merge of 'b8b628bfe4824f594298abb40c7545cefd3aa41a'

     and 'd2b977e2b47520e4d1f916319fbbf8f5f7202b7c'

7 files changed, 24 insertions, 144 deletions

diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR59.bb b/packages/altboot/altboot_1.1.1+wip-SVNR66.bb
index 4af0a7c630..912082c70f 100644
--- a/packages/altboot/altboot_1.1.1+wip-SVNR59.bb
+++ b/packages/altboot/altboot_1.1.1+wip-SVNR66.bb
@@ -1,8 +1,8 @@
 require altboot.inc
 
-PR = "r9"
+PR = "r0"
 
-SVN_REV = "59"
+SVN_REV = "66"
 SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV}"
 
 do_install() {
diff --git a/packages/fbreader/fbreader_0.8.2a.bb b/packages/fbreader/fbreader_0.8.2a.bb
index 3a0dc543e8..2419ccf4ae 100644
--- a/packages/fbreader/fbreader_0.8.2a.bb
+++ b/packages/fbreader/fbreader_0.8.2a.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://only.mawhrin.net/fbreader/"
 SECTION = "x11/utils"
 PRIORITY = "optional"
 DEPENDS = "gtk+ enca expat bzip2 libgpewidget"
-PR = "r3"
+PR = "r4"
 
 # The RESOLUTION is defined at compile time which makes
 # this package MACHINE specific.
@@ -13,6 +13,12 @@ PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
 SRC_URI = "http://only.mawhrin.net/fbreader/fbreader-sources-${PV}.tgz \
 	   file://fbreader-0.8.2a_buildsys_oe.patch;patch=1 \
 	   file://480x640-buildfix.patch;patch=1"
+	   
+SRC_URI_append_spitz = "\
+		  file://zaurus-VGA.patch;patch=1"
+
+SRC_URI_append_akita = "\
+		  file://zaurus-VGA.patch;patch=1"
 
 # Set the defaults
 READER_RESOLUTION = "240x320"
@@ -22,6 +28,8 @@ READER_STATUS	  = "release"
 
 # Set device specific overrides
 READER_RESOLUTION_fic-gta01 = "480x640"
+READER_RESOLUTION_spitz = "640x480"
+READER_RESOLUTION_akita = "640x480"
 
 FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary"
 
diff --git a/packages/fbreader/files/zaurus-VGA.patch b/packages/fbreader/files/zaurus-VGA.patch
new file mode 100644
index 0000000000..5ba7d91b9d
--- /dev/null
+++ b/packages/fbreader/files/zaurus-VGA.patch
@@ -0,0 +1,13 @@
+--- fbreader-0.8.2a/fbreader/data/default/styles.gpe640x480.xml.orig	2007-06-24 23:55:56.000000000 +0000
++++ fbreader-0.8.2a/fbreader/data/default/styles.gpe640x480.xml	2007-06-24 23:56:22.000000000 +0000
+@@ -1,8 +1,8 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <DefaultStyles>
+-	<base family="Sans" fontSize="16"/>
++	<base family="Sans" fontSize="8"/>
+ 	<style id="0" name="Regular Paragraph" firstLineIndentDelta="22" allowHyphenations="true"/>
+-	<style id="1" name="Title" fontSizeDelta="10" bold="true" spaceBefore="2" spaceAfter="7" alignment="center" allowHyphenations="false"/>
++	<style id="1" name="Title" fontSizeDelta="5" bold="true" spaceBefore="2" spaceAfter="7" alignment="center" allowHyphenations="false"/>
+ 	<style id="3" name="Poem Title" fontSizeDelta="2" bold="true" spaceBefore="6" spaceAfter="6" leftIndent="40" allowHyphenations="false"/>
+ 	<style id="2" name="Section Title" fontSizeDelta="6" bold="true" spaceAfter="5" alignment="center" allowHyphenations="false"/>
+ 	<style id="31" name="Header 1" fontSizeDelta="6" bold="true" spaceAfter="5" alignment="center" allowHyphenations="false"/>
diff --git a/packages/images/hentges-console-image.bb b/packages/images/hentges-console-image.bb
deleted file mode 100644
index 87381a4c77..0000000000
--- a/packages/images/hentges-console-image.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
-#               for a copy of the license)
-#
-# Filename: hentges-console-image.bb
-# Date: 20070516 (YMD)
-
-DESCRIPTION = "Hentges Console Image"
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-LICENSE = "GPL"
-
-######################################################################################
-
-PV = "${HENTGES_PV}"
-PR = "${HENTGES_PR}"
-
-######################################################################################
-
-export IMAGE_NAME = "hentges-console-image"
-export IMAGE_LINGUAS = ""
-export PACKAGE_INSTALL = "${RDEPENDS}"
-
-######################################################################################
-
-DEPENDS = "task-base \
-	   task-hentges-base"
-
-RDEPENDS = "task-base \
-	    task-hentges-base"
-
-######################################################################################
-
-inherit image
-
-
diff --git a/packages/images/hentges-x11-image.bb b/packages/images/hentges-x11-image.bb
deleted file mode 100644
index 475f9f0ea9..0000000000
--- a/packages/images/hentges-x11-image.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
-#               for a copy of the license)
-#
-# Filename: hentges-x11-image.bb
-# Date: 20070522 (YMD)
-
-DESCRIPTION = "Hentges X11 Image"
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-LICENSE = "MIT"
-
-######################################################################################
-
-PV = "${HENTGES_PV}"
-PR = "${HENTGES_PR}"
-
-######################################################################################
-
-export IMAGE_NAME = "hentges-x11-image"
-export IMAGE_LINGUAS = ""
-export PACKAGE_INSTALL = "${RDEPENDS}"
-
-######################################################################################
-
-PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
-PREFERRED_PROVIDER_tslib 		?= "tslib"
-PREFERRED_PROVIDER_virtual/libsdl 	?= "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libxine 	?= "libxine-x11"
-PREFERRED_PROVIDER_virtual/libx11       ?= "diet-x11"
-
-######################################################################################
-
-DEPENDS = "task-base \
-	   task-hentges-base \
-	   task-hentges-x11"
-
-RDEPENDS = "task-base \
-	    task-hentges-base \
-	    task-hentges-x11"
-
-######################################################################################
-
-inherit image
-
-
diff --git a/packages/tasks/task-hentges-base.bb b/packages/tasks/task-hentges-base.bb
deleted file mode 100644
index 89b39aeba9..0000000000
--- a/packages/tasks/task-hentges-base.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
-#               for a copy of the license)
-#
-# Filename: task-hentges-base.bb
-# Date: 20070516 (YMD)
-
-DESCRIPTION = "task-hentges-base"
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-LICENSE = "MIT"
-
-######################################################################################
-
-ALLOW_EMPTY = "1"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-######################################################################################
-
-PV = "${HENTGES_PV}"
-PR = "${HENTGES_PR}"
-
-######################################################################################
-	    
-#DEPENDS = "${HENTGES_DEPENDS}"
-#
-RDEPENDS = "${HENTGES_BASE_RDEPENDS}"
diff --git a/packages/tasks/task-hentges-x11.bb b/packages/tasks/task-hentges-x11.bb
deleted file mode 100644
index db658e9014..0000000000
--- a/packages/tasks/task-hentges-x11.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
-#               for a copy of the license)
-#
-# Filename: task-hentges-x11.bb
-# Date: 20070522 (YMD)
-
-DESCRIPTION = "task-hentges-x11"
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-LICENSE = "MIT"
-
-######################################################################################
-
-ALLOW_EMPTY = "1"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-######################################################################################
-
-PV = "${HENTGES_PV}"
-PR = "${HENTGES_PR}"
-
-######################################################################################
-	    
-DEPENDS = "task-angstrom-x11"
-
-RDEPENDS = "${HENTGES_X11_RDEPENDS}"