Misc changes to match OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@334 311d38ba-8fff-0310-9ca6-ca027cbcb966

10 files changed, 16 insertions, 15 deletions

diff --git a/openembedded/packages/gcalctool/files/makefile-fix.diff b/openembedded/packages/gcalctool/gcalctool/makefile-fix.diff
index 48a546271f..48a546271f 100644
--- a/openembedded/packages/gcalctool/files/makefile-fix.diff
+++ b/openembedded/packages/gcalctool/gcalctool/makefile-fix.diff
diff --git a/openembedded/packages/gcc/gcc3-build-cross.inc b/openembedded/packages/gcc/gcc3-build-cross.inc
index a41ae11d64..384886c76e 100644
--- a/openembedded/packages/gcc/gcc3-build-cross.inc
+++ b/openembedded/packages/gcc/gcc3-build-cross.inc
@@ -39,5 +39,9 @@ do_stage_append () {
         rmdir ${CROSS_DIR}/include || :
 
         # We don't really need to keep this around
-        rm -rf ${CROSS_DIR}/share
+        # rm -rf ${CROSS_DIR}/share but leave java there
+        for d in share/man share/info;
+        do
+                rm -rf ${CROSS_DIR}/$d
+        done
 }
diff --git a/openembedded/packages/gnome/orbit2-2.10.2/gtk-doc.m4 b/openembedded/packages/gnome/files/gtk-doc.m4
index 3ec41666b2..3ec41666b2 100644
--- a/openembedded/packages/gnome/orbit2-2.10.2/gtk-doc.m4
+++ b/openembedded/packages/gnome/files/gtk-doc.m4
diff --git a/openembedded/packages/gnome/orbit2-2.10.2/gtk-doc.make b/openembedded/packages/gnome/files/gtk-doc.make
index c319e7ad7c..c319e7ad7c 100644
--- a/openembedded/packages/gnome/orbit2-2.10.2/gtk-doc.make
+++ b/openembedded/packages/gnome/files/gtk-doc.make
diff --git a/openembedded/packages/gtk+/gtk+_2.6.7.bb b/openembedded/packages/gtk+/gtk+_2.6.7.bb
index e4e93cacdd..260a03684e 100644
--- a/openembedded/packages/gtk+/gtk+_2.6.7.bb
+++ b/openembedded/packages/gtk+/gtk+_2.6.7.bb
@@ -4,7 +4,6 @@ set of widgets, GTK+ is suitable for projects ranging from small one-off project
 HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt"
 PR = "r4"
 
diff --git a/openembedded/packages/libdaemon/libdaemon_0.6.bb b/openembedded/packages/libdaemon/libdaemon_0.6.bb
index 578c9b7674..2bdf8cb5cc 100644
--- a/openembedded/packages/libdaemon/libdaemon_0.6.bb
+++ b/openembedded/packages/libdaemon/libdaemon_0.6.bb
@@ -1,6 +1,8 @@
-SECTION = "libs"
 DESCRIPTION = "libdaemon is a lightweight C library which eases the writing of UNIX daemons."
+SECTION = "libs"
+AUTHOR = "Lennart Poettering <lennart@poettering.net>"
 HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/"
+MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 LICENSE = "GPLv2"
 
 SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz"
diff --git a/openembedded/packages/linux-hotplug/linux-hotplug_20040920.bb b/openembedded/packages/linux-hotplug/linux-hotplug_20040920.bb
index ce503a219e..c6bcbb66e6 100644
--- a/openembedded/packages/linux-hotplug/linux-hotplug_20040920.bb
+++ b/openembedded/packages/linux-hotplug/linux-hotplug_20040920.bb
@@ -8,7 +8,7 @@ RCONFLICTS_${PN} = "hotplug"
 RREPLACES_${PN} = "hotplug"
 SECTION = "base"
 RSUGGESTS = "pciutils usbutils"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20.tar.gz \
         file://userspecified_hcd.patch;patch=1 \
@@ -27,7 +27,9 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_09_2
         file://isapnp-exit.diff;patch=1 \
         file://usb-storage \
         file://soc.agent"
-           
+
+SRC_URI_append_openzaurus = " file://quiet-pci.patch;patch=1"
+
 S = "${WORKDIR}/hotplug-2004_09_20"
 
 INITSCRIPT_NAME = "hotplug"
diff --git a/openembedded/packages/loudmouth/loudmouth_1.0.1.bb b/openembedded/packages/loudmouth/loudmouth_1.0.1.bb
index ca8dd27778..9161cd630b 100755
--- a/openembedded/packages/loudmouth/loudmouth_1.0.1.bb
+++ b/openembedded/packages/loudmouth/loudmouth_1.0.1.bb
@@ -1,6 +1,6 @@
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 gnutls"
-MAINTAINER = "Chris Lord <chris@openedhand.com>"
+MAINTAINER = "Koen Kooi <koen@handhelds.org>"
 DESCRIPTION = "Loudmouth is a lightweight and easy-to-use C library for programming with the Jabber protocol."
 PR = "r1"
 
@@ -9,8 +9,5 @@ SRC_URI = "http://ftp.imendio.com/pub/imendio/${PN}/src/${PN}-${PV}.tar.gz"
 inherit autotools pkgconfig
 
 do_stage() {
-        oe_libinstall -so -C loudmouth libloudmouth-1 ${STAGING_LIBDIR}
-
-        install -d ${STAGING_INCDIR}/${PN}/
-        install -m 0644 ${S}/${PN}/*.h ${STAGING_INCDIR}/${PN}/
+        autotools_stage_all
 }
diff --git a/openembedded/packages/tslib/tslib/simpad/ts.conf b/openembedded/packages/tslib/tslib/simpad/ts.conf
deleted file mode 100644
index 09309719f2..0000000000
--- a/openembedded/packages/tslib/tslib/simpad/ts.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-module_raw input
-module pthres pmin=1
-module variance delta=30
-module dejitter delta=100
-module linear
diff --git a/openembedded/packages/zaurusd/zaurusd_0.0.bb b/openembedded/packages/zaurusd/zaurusd_svn.bb
index 164d9ca06f..d36fc1c118 100644
--- a/openembedded/packages/zaurusd/zaurusd_0.0.bb
+++ b/openembedded/packages/zaurusd/zaurusd_svn.bb
@@ -2,7 +2,9 @@ LICENSE = "GPL"
 SECTION = "base"
 MAINTAINER = "Richard Purdie <rpurdie@openedhand.com>"
 DESCRIPTION = "Daemon to handle device specifc features."
+PV = "0.0+svn${SRCDATE}"
 PR = "r0"
+DEPENDS = "tslib"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http"
 S = "${WORKDIR}/${PN}"