merge of '2283d6d9e723829fa3f8206557ade078993a8e80'

     and 'b98ae84398e0cce519822aa156ec0ef1d5de9794'

16 files changed, 150 insertions, 22 deletions

diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 0696ad1909..fb753dc85e 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -5,7 +5,6 @@ SRCDATE_at76c503a-modules ?= "20060814"
 SRCDATE_prism54-module ?= "20060814"
 
 # X11 libs, extentions and protos
-SRCDATE_xcalibrate ?= "20060804"
 SRCDATE_compositeext ?= "20060814"
 SRCDATE_drm ?= "20060814"
 SRCDATE_drm-kernel ?= "20060814"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 3993bf6ec0..e015314d92 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -185,5 +185,16 @@ PREFERRED_VERSION_wpa-supplicant ?= "0.5.1"
 PREFERRED_PROVIDER_virtual/db = "db"
 PREFERRED_PROVIDER_virtual/db-native = "db-native"
 
+SRCDATE_ipkg-utils ?= "20060106"
+SRCDATE_ipkg-utils-native ?= "20060106"
+SRCDATE_ipkg-link ?= "20060106"
+SRCDATE_irssi ?= "20050930"
+
+CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
+INHERIT += "nslu2-mirrors"
+
+PREFERRED_VERSION_ipkg ?= "0.99.154"
+PREFERRED_VERSION_ipkg-native ?= "0.99.154"
+
 #FIXME: HACK: REMOVE THIS
 IGNORE_STRIP_ERRORS = ""
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index da1efa9cc4..541eaef852 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -63,3 +63,15 @@ PREFERRED_VERSION_unslung-rootfs         ?= "2.3r63"
 PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63"
 PREFERRED_VERSION_nslu2-linksys-libs     ?= "2.3r63"
 PREFERRED_VERSION_nslu2-linksys-ramdisk  ?= "2.3r63"
+
+SRCDATE_ipkg-utils ?= "20060106"
+SRCDATE_ipkg-utils-native ?= "20060106"
+SRCDATE_ipkg-link ?= "20060106"
+SRCDATE_irssi ?= "20050930"
+
+CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
+INHERIT += "nslu2-mirrors"
+
+PREFERRED_VERSION_ipkg ?= "0.99.154"
+PREFERRED_VERSION_ipkg-native ?= "0.99.154"
+
diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf
index 93befb92ce..541d350f21 100644
--- a/conf/machine/include/ixp4xx.conf
+++ b/conf/machine/include/ixp4xx.conf
@@ -149,22 +149,6 @@ IPKG_EXTRA_ARCHS = "ixp4xx ${MACHINE} \
 IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_EXTRA_ARCHS}"
 
 #-------------------------------------------------------------------------------
-# Package versions
-#-------------------------------------------------------------------------------
-# Warning: these are shared across the different machine and distro
-# configurations but can be overridden therein if required.
-SRCDATE_ipkg-utils ?= "20060106"
-SRCDATE_ipkg-utils-native ?= "20060106"
-SRCDATE_ipkg-link ?= "20060106"
-SRCDATE_irssi ?= "20050930"
-
-CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
-INHERIT += "nslu2-mirrors"
-
-PREFERRED_VERSION_ipkg ?= "0.99.154"
-PREFERRED_VERSION_ipkg-native ?= "0.99.154"
-
-#-------------------------------------------------------------------------------
 # Board defaults
 #-------------------------------------------------------------------------------
 # These values are board specific but they seem to be common to a large number
diff --git a/packages/bluez/bluez-hcidump_1.32.bb b/packages/bluez/bluez-hcidump_1.32.bb
new file mode 100644
index 0000000000..877c8db33c
--- /dev/null
+++ b/packages/bluez/bluez-hcidump_1.32.bb
@@ -0,0 +1,13 @@
+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/libxml/libxml2_2.6.26.bb b/packages/libxml/libxml2_2.6.26.bb
new file mode 100644
index 0000000000..192eb14275
--- /dev/null
+++ b/packages/libxml/libxml2_2.6.26.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "GNOME XML library"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "MIT"
+
+SRC_URI = "http://xmlsoft.org/sources/libxml2/libxml2-${PV}.tar.gz"
+
+inherit autotools pkgconfig binconfig
+
+EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --without-c14n"
+
+do_stage() {
+	autotools_stage_all
+	install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+python populate_packages_prepend () {
+	# autonamer would call this libxml2-2, but we don't want that
+	if bb.data.getVar('DEBIAN_NAMES', d, 1):
+		bb.data.setVar('PKG_libxml2', 'libxml2', d)
+}
+
+PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dev += "${bindir}/*-config"
+FILES_${PN}-utils += "${bindir}/*"
diff --git a/packages/libxslt/libxslt-1.1.17/.mtn2git_empty b/packages/libxslt/libxslt-1.1.17/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libxslt/libxslt-1.1.17/.mtn2git_empty
diff --git a/packages/libxslt/libxslt-1.1.17/destdir.patch b/packages/libxslt/libxslt-1.1.17/destdir.patch
new file mode 100644
index 0000000000..8df1b206bc
--- /dev/null
+++ b/packages/libxslt/libxslt-1.1.17/destdir.patch
@@ -0,0 +1,10 @@
+Index: libxslt-1.1.17/libxslt/Makefile.am
+===================================================================
+--- libxslt-1.1.17.orig/libxslt/Makefile.am	2005-10-02 11:25:21.000000000 +0200
++++ libxslt-1.1.17/libxslt/Makefile.am	2006-09-29 23:13:35.000000000 +0200
+@@ -61,4 +61,4 @@
+ 	@(cd ../xsltproc ; $(MAKE))
+ 
+ install-exec-hook:
+-	$(mkinstalldirs) "$(libdir)/libxslt-plugins"
++	$(mkinstalldirs) "$(DESTDIR)$(libdir)/libxslt-plugins"
diff --git a/packages/libxslt/libxslt_1.1.17.bb b/packages/libxslt/libxslt_1.1.17.bb
new file mode 100644
index 0000000000..816b3fdd04
--- /dev/null
+++ b/packages/libxslt/libxslt_1.1.17.bb
@@ -0,0 +1,45 @@
+DESCRIPTION = "GNOME XSLT library"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "libxml2"
+LICENSE = "MIT"
+PR = "r2"
+
+SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz"
+S = "${WORKDIR}/libxslt-${PV}"
+
+inherit autotools pkgconfig 
+
+EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto"
+
+xsltheaders = "attributes.h documents.h extensions.h extra.h functions.h imports.h \
+               keys.h namespaces.h numbersInternals.h pattern.h preproc.h security.h \
+               templates.h transform.h variables.h xslt.h xsltInternals.h xsltconfig.h \
+               xsltexports.h xsltutils.h"
+exsltheaders = "exslt.h exsltconfig.h exsltexports.h"
+
+do_stage () {
+	oe_libinstall -C libxslt -so -a libxslt ${STAGING_LIBDIR}
+	oe_libinstall -C libexslt -so -a libexslt ${STAGING_LIBDIR}
+
+	mkdir -p ${STAGING_INCDIR}/libxslt
+	for i in ${xsltheaders}; do
+		install -m 0644 ${S}/libxslt/$i ${STAGING_INCDIR}/libxslt/$i
+	done
+	mkdir -p ${STAGING_INCDIR}/libexslt
+	for i in ${exsltheaders}; do
+		install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i
+	done
+
+	cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \
+		       	     -e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \
+			     -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
+			     -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/xslt-config
+	chmod a+rx ${STAGING_BINDIR}/xslt-config
+	install -m 0644 libxslt.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dev += "${bindir}/xslt-config"
+FILES_${PN}-utils += "${bindir}"
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index bf1f448769..2d923c8acb 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -34,7 +34,6 @@ SLUGOS_PACKAGES = "\
 	bind \
 	binutils \
 	bison \
-	bluez-libs \
 	bluez-utils-nodbus \
 	bridge-utils \
 	bzip2 \
diff --git a/packages/subversion/subversion_1.3.2.bb b/packages/subversion/subversion_1.4.0.bb
index f508381d15..f508381d15 100644
--- a/packages/subversion/subversion_1.3.2.bb
+++ b/packages/subversion/subversion_1.4.0.bb
diff --git a/packages/tcltk/tcl_8.4.11.bb b/packages/tcltk/tcl_8.4.11.bb
index 59d4162e53..f2eed37667 100644
--- a/packages/tcltk/tcl_8.4.11.bb
+++ b/packages/tcltk/tcl_8.4.11.bb
@@ -2,11 +2,12 @@ DESCRIPTION = "Tool Command Language"
 LICENSE = "tcl"
 SECTION = "devel/tcltk"
 HOMEPAGE = "http://tcl.sourceforge.net"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
            file://tcl-add-soname.patch;patch=1 \
            file://fix-configure.patch;patch=1;pnum=2"
+
 S = "${WORKDIR}/tcl${PV}/unix"
 
 inherit autotools
@@ -25,6 +26,7 @@ do_compile_prepend() {
 do_stage() {
 	oe_libinstall -a libtclstub8.4 ${STAGING_LIBDIR}
 	oe_libinstall -so libtcl8.4 ${STAGING_LIBDIR}
+	sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
 	install -m 0755 tclConfig.sh ${STAGING_BINDIR}
 	cd ..
 	for dir in compat generic unix
diff --git a/packages/tcltk/tk_8.4.11.bb b/packages/tcltk/tk_8.4.11.bb
index 69a3227437..e70db703e9 100644
--- a/packages/tcltk/tk_8.4.11.bb
+++ b/packages/tcltk/tk_8.4.11.bb
@@ -4,12 +4,13 @@ SECTION = "devel/tcltk"
 HOMEPAGE = "http://tcl.sourceforge.net"
 DEPENDS = "tcl virtual/libx11 libxt"
 RDEPENDS = "tcl"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \
            file://disable-xim.patch;patch=1;pnum=0 \
            file://tk-add-soname.patch;patch=1 \
            file://fix-configure.patch;patch=1;pnum=2"
+
 S = "${WORKDIR}/tk${PV}/unix"
 
 inherit autotools
@@ -25,6 +26,7 @@ do_configure() {
 do_stage() {
         oe_libinstall -a libtkstub8.4 ${STAGING_LIBDIR}
         oe_libinstall -so libtk8.4 ${STAGING_LIBDIR}
+        sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tkConfig.sh
         install -m 0755 tkConfig.sh ${STAGING_BINDIR}
 	cd ..
 	#for dir in compat generic unix
diff --git a/packages/xcalibrateext/xcalibrateext_git.bb b/packages/xcalibrateext/xcalibrateext_git.bb
new file mode 100644
index 0000000000..40c21ebd74
--- /dev/null
+++ b/packages/xcalibrateext/xcalibrateext_git.bb
@@ -0,0 +1,13 @@
+PV = "0.0+git${SRCDATE}"
+SECTION = "x11/libs"
+LICENSE = "BSD-X"
+DESCRIPTION = "XCalibrate extension headers"
+
+SRC_URI = "git://anongit.freedesktop.org/xorg/proto/calibrateproto;protocol=git"
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xournal/xournal_0.2.bb b/packages/xournal/xournal_0.2.bb
index cd85a01f37..71299513e9 100644
--- a/packages/xournal/xournal_0.2.bb
+++ b/packages/xournal/xournal_0.2.bb
@@ -1,4 +1,4 @@
-HOMEPAGE = "http://www-math.mit.edu/~auroux/software/xournal/"
+HOMEPAGE = "http://xournal.sf.net/"
 DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a journal using a stylus."
 MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 DEPENDS = "gtk+ libgnomecanvas"
@@ -6,7 +6,7 @@ SECTION = "x11"
 LICENSE = "GPL"
 PR = "r1"
 
-SRC_URI = "http://math.mit.edu/~auroux/software/xournal/xournal.tar.gz \
+SRC_URI = "http://xournal.sourceforge.net/xournal-0.2.tar.gz \
         file://no-printing.diff;patch=1"
 
 inherit autotools pkgconfig
diff --git a/packages/xournal/xournal_0.3.1.bb b/packages/xournal/xournal_0.3.1.bb
new file mode 100644
index 0000000000..3ab60725d6
--- /dev/null
+++ b/packages/xournal/xournal_0.3.1.bb
@@ -0,0 +1,12 @@
+HOMEPAGE = "http://xournal.sf.net/"
+DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a journal using a stylus."
+MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
+DEPENDS = "gtk+ libgnomecanvas"
+SECTION = "x11"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://xournal.sourceforge.net/xournal-0.3.1.tar.gz \
+	"
+
+inherit autotools pkgconfig