merge of 'ce940581e011db1183eaa6c8d9f0da4779d9a7eb'

     and 'f8f0bdb156516a6dce5f3027c090dc2046676e17'

5 files changed, 40 insertions, 17 deletions

diff --git a/packages/aircrack/aircrack-ng_1.0-svn.bb b/packages/aircrack/aircrack-ng_1.0-svn.bb
index a09957bb45..0f0f7f532d 100644
--- a/packages/aircrack/aircrack-ng_1.0-svn.bb
+++ b/packages/aircrack/aircrack-ng_1.0-svn.bb
@@ -2,11 +2,10 @@ DESCRIPTION = "Aircrack-ng is a set of tools for wep key statistical cracking"
 HOMEPAGE = "http://www.aircrack-ng.org/"
 SECTION = "console/network"
 LICENSE = "GPLv2"
-DEPENDS = "openssl"
-PV = "0.9.99+svn${SRCDATE}"
-PR = "r0"
-SRC_URI = "svn://trac.aircrack-ng.org/svn/branch;module=1.0-dev;proto=http \
-           file://makefile-ldflags.patch;patch=1;maxdate=20070629 "
+DEPENDS = "openssl zlib sqlite3"
+PV = "0.9.99+svnr${SRCREV}"
+PR = "r1"
+SRC_URI = "svn://trac.aircrack-ng.org/svn/branch;module=1.0-dev;proto=http"
  
 S="${WORKDIR}/1.0-dev"
  
@@ -14,6 +13,10 @@ DEFAULT_PREFERENCE = "-1"
 
 export TOOL_PREFIX = "${HOST_SYS}-"
 
+do_compile() {
+	oe_runmake SQLITE=true
+}
+
 do_install() {
         install -d ${D}/${sbindir}
         install -d ${D}/${bindir}
@@ -22,12 +25,16 @@ do_install() {
         install -m 0755 src/aireplay-ng       ${D}/${sbindir}
         install -m 0755 src/airserv-ng        ${D}/${sbindir}
         install -m 0755 src/wesside-ng        ${D}/${sbindir}
+        install -m 0755 src/easside-ng        ${D}/${sbindir}
         install -m 0755 src/airdecap-ng       ${D}/${bindir}
         install -m 0755 src/packetforge-ng    ${D}/${bindir}
         install -m 0755 airmon-ng             ${D}/${sbindir}
         install -m 0755 src/ivstools          ${D}/${bindir}
         install -m 0755 src/kstats            ${D}/${bindir}
         install -m 0755 src/airtun-ng         ${D}/${sbindir}
-        install -m 0755 test/makeivs          ${D}/${bindir}
+        install -m 0755 src/makeivs-ng        ${D}/${bindir}
+        install -m 0755 src/buddy-ng          ${D}/${bindir}
+# I'm not including airdriver-ng as it is for building drivers and most people
+# cannot use it on their handheld anyway.
 }
 
diff --git a/packages/libxml/libxml2_2.6.29.bb b/packages/libxml/libxml2_2.6.29.bb
index 6904031670..521ba16d9b 100644
--- a/packages/libxml/libxml2_2.6.29.bb
+++ b/packages/libxml/libxml2_2.6.29.bb
@@ -14,9 +14,12 @@ export LDFLAGS += "-ldl"
 
 do_stage() {
 	autotools_stage_all
-	install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
-        #this is need it by php during its install
-        install -m 0755 xml2-config ${STAGING_BINDIR_CROSS}
+	install -d ${STAGING_DATADIR}/aclocal/
+	install -d ${STAGING_BINDIR_CROSS}
+
+ 	install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
+	#this is need it by php during its install
+	install -m 0755 xml2-config ${STAGING_BINDIR_CROSS}
 }
 
 python populate_packages_prepend () {
diff --git a/packages/openmoko2/libjana_svn.bb b/packages/openmoko2/libjana_svn.bb
index ca33f08e84..3b18a597f6 100644
--- a/packages/openmoko2/libjana_svn.bb
+++ b/packages/openmoko2/libjana_svn.bb
@@ -1,13 +1,12 @@
 DESCRIPTION = "O-Hand Jana Library"
-DEPENDS = "libmokojournal2 gtk+ eds-dbus" 
+DEPENDS = "libmokojournal2 gtk+ eds-dbus gconf" 
 PV = "0.1.0+svnr${SRCREV}"
 PR = "r3"
 
 inherit autotools pkgconfig lib_package
 
-SRC_URI = "svn://svn.o-hand.com/repos/dates/branches;module=jana;proto=http \
-           file://clockpatch.patch;patch=1"
-S = "${WORKDIR}/jana/"
+SRC_URI = "svn://svn.o-hand.com/repos/jana/;module=trunk;proto=http"
+S = "${WORKDIR}/trunk/"
 
 do_configure_prepend() {
 	touch gtk-doc.make
@@ -24,7 +23,7 @@ PACKAGES = "libjana-ecal libjana-ecal-dbg \
 
 FILES_libjana-ecal = "${libdir}/libjana.so.*"
 FILES_libjana-ecal-dbg = "${libdir}/.debug/libjana-ecal*"
-FILES_libjana-gtk = "${libdir}/libjana-gtk.so.*"
+FILES_libjana-gtk = "${libdir}/libjana-gtk.so.* ${datadir}/jana/landwater.vmf"
 FILES_libjana-gtk-dbg = "${libdir}/.debug/libjana-gtk.so.*"
 FILES_libjana = "${libdir}/libjana.so.*"
 FILES_libjana-dbg = "${libdir}/.debug/libjana.so.*"
diff --git a/packages/openmoko2/openmoko-dates2_svn.bb b/packages/openmoko2/openmoko-dates2_svn.bb
index 5b439a7fcc..f9c04f8f92 100644
--- a/packages/openmoko2/openmoko-dates2_svn.bb
+++ b/packages/openmoko2/openmoko-dates2_svn.bb
@@ -7,8 +7,8 @@ PR = "r2"
 
 inherit openmoko2 pkgconfig
 
-SRC_URI = "svn://svn.o-hand.com/repos/dates/branches;module=jana;proto=http"
-S = "${WORKDIR}/jana/"
+SRC_URI = "svn://svn.o-hand.com/repos/dates/branches;module=openmoko2;proto=http"
+S = "${WORKDIR}/openmoko2/"
 
 EXTRA_OECONF = "--with-frontend=openmoko"
 
diff --git a/packages/openmoko2/openmoko-mediaplayer2_svn.bb b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
index 3892a6e70f..63f12ae283 100644
--- a/packages/openmoko2/openmoko-mediaplayer2_svn.bb
+++ b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
@@ -3,8 +3,22 @@ SECTION = "openmoko/tools"
 DEPENDS = "libmokoui2 expat gstreamer libspiff curl"
 RDEPENDS = "gst-meta-audio"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
 inherit openmoko2
 
 FILES_${PN} += "${datadir}/openmoko-mediaplayer"
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/gconf/schemas
+	install -m 0644 ${S}/openmoko-mediaplayer.schemas ${D}${sysconfdir}/gconf/schemas/openmoko-mediaplayer.schemas
+}
+
+pkg_postinst_openmoko-mediaplayer2 () {
+#!/bin/sh -e
+if [ "x$D" != "x" ]; then
+    exit 1
+fi
+
+gconftool-2 --makefile-install-rule ${D}${sysconfdir}/gconf/schemas/openmoko-mediaplayer.schemas > /dev/null
+}