merge of '8c185e14edc5b4a26b15fd54f158e22f3f659282'

     and 'c70fa985cd7a9e0166e70d97ccac1c7dd324fe8b'

8 files changed, 67 insertions, 38 deletions

diff --git a/packages/abiword/abiword-embedded_2.6.4.bb b/packages/abiword/abiword-embedded_2.6.4.bb
new file mode 100644
index 0000000000..98e69515fa
--- /dev/null
+++ b/packages/abiword/abiword-embedded_2.6.4.bb
@@ -0,0 +1,8 @@
+require abiword-2.5.inc
+
+EXTRA_OECONF += "--enable-embedded"
+
+S = "${WORKDIR}/abiword-${PV}"
+
+RCONFLICTS = "abiword"
+RPROVIDES += "abiword"
diff --git a/packages/gnumeric/gnumeric_1.8.2.bb b/packages/gnumeric/gnumeric_1.8.2.bb
index f7654117d7..8d3b1b5fb7 100644
--- a/packages/gnumeric/gnumeric_1.8.2.bb
+++ b/packages/gnumeric/gnumeric_1.8.2.bb
@@ -6,6 +6,8 @@ DESCRIPTION = "Gnumeric spreadsheet for GNOME"
 
 PR = "r1"
 
+PARALLEL_MAKE = ""
+
 inherit gnome flow-lossage
 
 SRC_URI += "file://remove-docs.patch;patch=1"
diff --git a/packages/gnumeric/gnumeric_1.8.3.bb b/packages/gnumeric/gnumeric_1.8.3.bb
index 9fa01408f6..0f70e37d5c 100644
--- a/packages/gnumeric/gnumeric_1.8.3.bb
+++ b/packages/gnumeric/gnumeric_1.8.3.bb
@@ -6,6 +6,8 @@ DESCRIPTION = "Gnumeric spreadsheet for GNOME"
 
 PR = "r0"
 
+PARALLEL_MAKE = ""
+
 inherit gnome flow-lossage
 
 SRC_URI += "file://remove-docs.patch;patch=1"
diff --git a/packages/leafpad/leafpad_0.8.15.bb b/packages/leafpad/leafpad_0.8.15.bb
index 3446b4f74e..9017c11dbf 100644
--- a/packages/leafpad/leafpad_0.8.15.bb
+++ b/packages/leafpad/leafpad_0.8.15.bb
@@ -1,25 +1,19 @@
 DESCRIPTION = "GTK+ based simple text editor"
+DESCRIPTION_${PN}-icons = "Extra icon files for leafpad text editor"
 HOMEPAGE = "http://tarot.freeshell.org/leafpad"
 AUTHOR = "Tarot Osuji <tarot@sdf.lonestar.org>"
 SECTION = "x11/applications"
 LICENSE = "GPLv2"
-DEPENDS = "gtk+"
-SRC_URI = "http://savannah.nongnu.org/download/${PN}/${PN}-${PV}.tar.gz \
-           file://leafpad.desktop \
-           file://leafpad.png"
-PR = "r0"
+DEPENDS = "gtk+ intltool-native"
+SRC_URI = "http://savannah.nongnu.org/download/${PN}/${PN}-${PV}.tar.gz"
+
+PR = "r1"
 
 inherit autotools pkgconfig
 
 EXTRA_OECONF = " --enable-chooser --enable-emacs --disable-print"
 
-do_install_append () {
-        install -d ${D}/${datadir}
-        install -d ${D}/${datadir}/applications
-        install -d ${D}/${datadir}/pixmaps/
-
-        install -m 0644 ${WORKDIR}/leafpad.png ${D}/${datadir}/pixmaps
-        install -m 0644 ${WORKDIR}/leafpad.desktop ${D}/${datadir}/applications
-}
+PACKAGES =+ "${PN}-icons"
 
+FILES_${PN}-icons = "${datadir}/icons"
 FILES_${PN} += "${datadir}/applications ${datadir}/pixmaps ${datadir}/icons"
diff --git a/packages/libopie/libopie2/c7x0_w100_disable.patch b/packages/libopie/libopie2/c7x0_w100_disable.patch
new file mode 100644
index 0000000000..959c56c443
--- /dev/null
+++ b/packages/libopie/libopie2/c7x0_w100_disable.patch
@@ -0,0 +1,20 @@
+--- libopie2/opiecore/device/odevice_zaurus.cpp	10 Aug 2008 09:07:32 -0000	1.55
++++ libopie2/opiecore/device/odevice_zaurus.cpp	20 Sep 2008 23:56:20 -0000
+@@ -313,14 +313,14 @@
+     }
+ 
+     // set default qte driver
+-    switch( d->m_model )
++/*    switch( d->m_model )
+     {
+         case Model_Zaurus_SLC7x0:
+             d->m_qteDriver = "W100";
+             break;
+-        default:
++        default:*/
+             d->m_qteDriver = "Transformed";
+-    }
++//    }
+ 
+     m_leds[0] = Led_Off;
+ 
diff --git a/packages/libopie/libopie2_1.2.3.bb b/packages/libopie/libopie2_1.2.3.bb
index 522fe55f7c..d0f9e9e17a 100644
--- a/packages/libopie/libopie2_1.2.3.bb
+++ b/packages/libopie/libopie2_1.2.3.bb
@@ -1,12 +1,13 @@
 require ${PN}.inc
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
            file://include.pro \
            file://gcc-syntax-fix.patch;patch=1 \
            file://h4000_and_default_rot.patch;patch=1 \
            file://ipaq_rotate_fix.patch;patch=1 \
-           file://spitz_rotate_fix.patch;patch=1"
+           file://spitz_rotate_fix.patch;patch=1 \
+           file://c7x0_w100_disable.patch;patch=1"
 
 SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
diff --git a/packages/vnc/tightvnc_1.3.9.bb b/packages/vnc/tightvnc_1.3.9.bb
new file mode 100644
index 0000000000..ec6a7057d9
--- /dev/null
+++ b/packages/vnc/tightvnc_1.3.9.bb
@@ -0,0 +1,25 @@
+DESCRIPTION-${PN}-viewer = "A lightweight VNC viewer"
+HOMEPAGE = "http://www.tightvnc.com/"
+DEPENDS = "virtual/libx11 zlib libxmu libxaw"
+LICENSE = "GPL"
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/vnc-tight/${PN}-${PV}_unixsrc.tar.gz \
+           file://Makefile"
+
+S = "${WORKDIR}/vnc_unixsrc/vncviewer/"
+
+PACKAGES = "${PN}-viewer-dbg ${PN}-viewer"
+FILES_${PN}-viewer-dbg = "${bindir}/.debug"
+FILES_${PN}-viewer = "${bindir}/${PN}viewer"
+
+do_compile () {
+	install ${WORKDIR}/Makefile ${S}
+	oe_runmake
+}
+
+do_install () {
+	install -d ${D}${bindir}
+	install ${PN}viewer ${D}${bindir}
+}
diff --git a/packages/vnc/tightvnc_1.3dev7.bb b/packages/vnc/tightvnc_1.3dev7.bb
deleted file mode 100644
index 64d9748755..0000000000
--- a/packages/vnc/tightvnc_1.3dev7.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "A Unix VNC client"
-HOMEPAGE = "http://www.tightvnc.com/"
-DEPENDS = "virtual/libx11 zlib libxmu libxaw"
-LICENSE = "GPL"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/vnc-tight/tightvnc-1.3dev7_unixsrc.tar.gz \
-           file://Makefile"
-
-S = "${WORKDIR}/vnc_unixsrc/vncviewer/"
-
-PACKAGES = "tightvncviewer-dbg tightvncviewer"
-FILES_tightvncviewer = "/usr/bin/tightvncviewer"
-
-do_compile () {
-	install ${WORKDIR}/Makefile ${S}
-	oe_runmake
-}
-
-do_install () {
-	install -d ${D}${bindir}
-	install tightvncviewer ${D}${bindir}
-}
-