merge of 1a138e228b9a27d00855a6c27775e9b2430220a2

     and b7f6ccdd490a93fd12ab881d78d03c39cc31ecba

14 files changed, 52 insertions, 9 deletions

diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc
index b9a0e25724..26f1531c0e 100644
--- a/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/preferred-gpe-versions-2.7.inc
@@ -50,13 +50,13 @@ PREFERRED_VERSION_gpe-today ?= "0.10"
 PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
 PREFERRED_VERSION_dbus ?= "0.23.4"
 PREFERRED_VERSION_gpe-beam ?= "0.2.8" 
-PREFERRED_VERSION_gpe-bluetooth ?= "0.45"
+PREFERRED_VERSION_gpe-bluetooth ?= "0.46"
 PREFERRED_VERSION_gpe-su ?= "0.18"
 PREFERRED_VERSION_gpe-conf ?= "0.1.25"
 PREFERRED_VERSION_gpe-clock ?= "0.21"
 PREFERRED_VERSION_gpe-mininet ?= "0.5"
 PREFERRED_VERSION_gpe-mixer ?= "0.42"
-PREFERRED_VERSION_gpe-shield ?= "0.7"
+PREFERRED_VERSION_gpe-shield ?= "0.8"
 PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6"
 PREFERRED_VERSION_gpe-taskmanager ?= "0.18"
 PREFERRED_VERSION_keylaunch ?= "2.0.7"
diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf
index 0b6a6654cc..3d58f51409 100644
--- a/conf/distro/ucslugc-packages.conf
+++ b/conf/distro/ucslugc-packages.conf
@@ -125,6 +125,7 @@ ${PKGDIR}/packages/openssh/*.bb \
 ${PKGDIR}/packages/openssl/*.bb \
 ${PKGDIR}/packages/openvpn/*.bb \
 ${PKGDIR}/packages/patch/*.bb \
+${PKGDIR}/packages/patcher/*.bb \
 ${PKGDIR}/packages/pciutils/*.bb \
 ${PKGDIR}/packages/pcmcia-cs/*.bb \
 ${PKGDIR}/packages/pcre/*.bb \
diff --git a/packages/bluez/bluez-hcidump_1.26.bb b/packages/bluez/bluez-hcidump_1.26.bb
new file mode 100644
index 0000000000..0cbc0fd6ec
--- /dev/null
+++ b/packages/bluez/bluez-hcidump_1.26.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool."
+SECTION = "console"
+PRIORITY = "optional"
+DEPENDS = "bluez-libs"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz"
+S = "${WORKDIR}/bluez-hcidump-${PV}"
+
+EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
+
+inherit autotools
+
+
diff --git a/packages/dhcp/dhcp_3.0.1.bb b/packages/dhcp/dhcp_3.0.1.bb
index c734af1534..5241fc6f69 100644
--- a/packages/dhcp/dhcp_3.0.1.bb
+++ b/packages/dhcp/dhcp_3.0.1.bb
@@ -3,9 +3,10 @@ DESCRIPTION = "Internet Software Consortium DHCP package"
 HOMEPAGE = "http://www.isc.org/"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "BSD"
-PR = "r1"
+PR = "r2"
 SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \
 	   file://noattrmode.patch;patch=1 \
+	   file://fixincludes.patch;patch=1 \
 	   file://init-relay file://default-relay \
 	   file://init-server file://default-server \
 	   file://dhclient.conf file://dhcpd.conf"
diff --git a/packages/dhcp/dhcp_3.0.2.bb b/packages/dhcp/dhcp_3.0.2.bb
index c734af1534..5241fc6f69 100644
--- a/packages/dhcp/dhcp_3.0.2.bb
+++ b/packages/dhcp/dhcp_3.0.2.bb
@@ -3,9 +3,10 @@ DESCRIPTION = "Internet Software Consortium DHCP package"
 HOMEPAGE = "http://www.isc.org/"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "BSD"
-PR = "r1"
+PR = "r2"
 SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \
 	   file://noattrmode.patch;patch=1 \
+	   file://fixincludes.patch;patch=1 \
 	   file://init-relay file://default-relay \
 	   file://init-server file://default-server \
 	   file://dhclient.conf file://dhcpd.conf"
diff --git a/packages/dhcp/files/fixincludes.patch b/packages/dhcp/files/fixincludes.patch
new file mode 100644
index 0000000000..91d99cce22
--- /dev/null
+++ b/packages/dhcp/files/fixincludes.patch
@@ -0,0 +1,10 @@
+--- dhcp-3.0.2/common/tr.c~compile	2005-10-13 14:23:37.000000000 +0200
++++ dhcp-3.0.2/common/tr.c	2005-10-13 14:23:45.000000000 +0200
+@@ -39,6 +39,7 @@
+ #include "includes/netinet/udp.h"
+ #include "includes/netinet/if_ether.h"
+ #include "netinet/if_tr.h"
++#include <asm/types.h>
+ #include <sys/time.h>
+ 
+ /*
diff --git a/packages/libgpewidget/libgpewidget_0.105.bb b/packages/libgpewidget/libgpewidget_0.105.bb
new file mode 100644
index 0000000000..f7d45ff0e8
--- /dev/null
+++ b/packages/libgpewidget/libgpewidget_0.105.bb
@@ -0,0 +1,17 @@
+LICENSE = "LGPL"
+DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native"
+
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
+
+inherit pkgconfig autotools
+
+EXTRA_OECONF = "--enable-cairo"
+
+do_stage () {
+	autotools_stage_all
+}
+
diff --git a/packages/libgpewidget/libgpewidget_cvs.bb b/packages/libgpewidget/libgpewidget_cvs.bb
index 31df65b281..42230bab5e 100644
--- a/packages/libgpewidget/libgpewidget_cvs.bb
+++ b/packages/libgpewidget/libgpewidget_cvs.bb
@@ -9,7 +9,7 @@ LICENSE = "LGPL"
 DEFAULT_PREFERENCE = "-1"
 
 S =  "${WORKDIR}/${PN}"
-PV = "0.102+cvs-${CVSDATE}"
+PV = "0.105-cvs-${CVSDATE}"
 PR = "r0"
 
 inherit autotools pkgconfig
diff --git a/packages/qpf-fonts/qpf-dejavusans_1.14.bb b/packages/qpf-fonts/qpf-dejavusans_1.15.bb
index 3428d98a89..3428d98a89 100644
--- a/packages/qpf-fonts/qpf-dejavusans_1.14.bb
+++ b/packages/qpf-fonts/qpf-dejavusans_1.15.bb
diff --git a/packages/qpf-fonts/qpf-dejavusanscondensed_1.14.bb b/packages/qpf-fonts/qpf-dejavusanscondensed_1.15.bb
index 7494374023..7494374023 100644
--- a/packages/qpf-fonts/qpf-dejavusanscondensed_1.14.bb
+++ b/packages/qpf-fonts/qpf-dejavusanscondensed_1.15.bb
diff --git a/packages/qpf-fonts/qpf-dejavusansmono_1.14.bb b/packages/qpf-fonts/qpf-dejavusansmono_1.15.bb
index 51c9e1b925..51c9e1b925 100644
--- a/packages/qpf-fonts/qpf-dejavusansmono_1.14.bb
+++ b/packages/qpf-fonts/qpf-dejavusansmono_1.15.bb
diff --git a/packages/qpf-fonts/qpf-dejavuserif_1.14.bb b/packages/qpf-fonts/qpf-dejavuserif_1.15.bb
index 81009e8a8c..81009e8a8c 100644
--- a/packages/qpf-fonts/qpf-dejavuserif_1.14.bb
+++ b/packages/qpf-fonts/qpf-dejavuserif_1.15.bb
diff --git a/packages/qpf-fonts/qpf-dejavuserifcondensed_1.14.bb b/packages/qpf-fonts/qpf-dejavuserifcondensed_1.15.bb
index db31216907..db31216907 100644
--- a/packages/qpf-fonts/qpf-dejavuserifcondensed_1.14.bb
+++ b/packages/qpf-fonts/qpf-dejavuserifcondensed_1.15.bb
diff --git a/packages/ttf-fonts/ttf-dejavu_1.14-20051003.bb b/packages/ttf-fonts/ttf-dejavu_1.15.bb
index 06a0dd5d1f..ca84ccbe8e 100644
--- a/packages/ttf-fonts/ttf-dejavu_1.14-20051003.bb
+++ b/packages/ttf-fonts/ttf-dejavu_1.15.bb
@@ -3,13 +3,11 @@ LICENSE = "Bitstream Vera"
 HOMEPAGE = "http://dejavu.sourceforge.net/wiki/index.php/Main_Page"
 MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 
-#SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}.tar.gz"
-SRC_URI = "http://handhelds.org/~hrw/mirror/dejavu-ttf-20051003.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}.tar.gz"
 
 include ttf.inc
 
-#S = "${WORKDIR}/dejavu-ttf-${PV}"
-S = "${WORKDIR}/dejavu-ttf-20051003"
+S = "${WORKDIR}/dejavu-ttf-${PV}"
 
 PACKAGES = "ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-sans-condensed \
 	    ttf-dejavu-serif ttf-dejavu-serif-condensed"