merge of '6b297f40d507a619bdd7d471e82d15807c186499'

     and '9a77355907ffaa2a2ea581e3bb7d0ffaa7e4b9fb'

7 files changed, 58 insertions, 9 deletions

diff --git a/packages/openmoko-projects/diversity-daemon_svn.bb b/packages/openmoko-projects/diversity-daemon_svn.bb
index 6ea4f54a92..02e1ea29bb 100644
--- a/packages/openmoko-projects/diversity-daemon_svn.bb
+++ b/packages/openmoko-projects/diversity-daemon_svn.bb
@@ -2,10 +2,10 @@ DESCRIPTION = "Diveristy Daemon"
 HOMEPAGE = "http://diversity.projects.openmoko.org/"
 SECTION = "net/misc"
 LICENSE = "GPL"
-DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus gypsy libjana curl"
-RDEPENDS = "eds-dbus gypsy openmoko-dialer2"
+DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus libjana curl"
+RDEPENDS = "eds-dbus openmoko-dialer2"
 PV = "0.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https"
 
@@ -13,7 +13,7 @@ S = "${WORKDIR}/diversity-daemon"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--disable-nm --disable-geoclue --disable-xmpp --enable-session-bus"
+EXTRA_OECONF = "--disable-nm --disable-xmpp --enable-session-bus"
 
 FILES_${PN} += "${datadir}/dbus-1/"
 FILES_${PN} += "${sysconfdir}/dbus-1/"
diff --git a/packages/openmoko-projects/diversity-nav_svn.bb b/packages/openmoko-projects/diversity-nav_svn.bb
index 58090e9baf..23d6b4daf6 100644
--- a/packages/openmoko-projects/diversity-nav_svn.bb
+++ b/packages/openmoko-projects/diversity-nav_svn.bb
@@ -3,9 +3,9 @@ HOMEPAGE = "http://diversity.projects.openmoko.org/"
 SECTION = "openmoko/applications"
 LICENSE = "GPL"
 DEPENDS = "evas edje ecore edbus"
-RDEPENDS = "libevas-engine-buffer libevas-engine-software-16 libevas-engine-software-16-x11 libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-eet libevas-loader-jpeg libevas-loader-png"
+RDEPENDS = "diversity-daemon"
 PV = "0.0.1+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-nav;proto=https"
 
diff --git a/packages/openmoko-projects/tangogps/.mtn2git_empty b/packages/openmoko-projects/tangogps/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko-projects/tangogps/.mtn2git_empty
diff --git a/packages/openmoko-projects/tangogps/global-config-h.patch b/packages/openmoko-projects/tangogps/global-config-h.patch
new file mode 100644
index 0000000000..973710c942
--- /dev/null
+++ b/packages/openmoko-projects/tangogps/global-config-h.patch
@@ -0,0 +1,30 @@
+Index: tangoGPS-0.7/src/globals.c
+===================================================================
+--- tangoGPS-0.7.orig/src/globals.c	2008-03-13 14:21:02.000000000 +0800
++++ tangoGPS-0.7/src/globals.c	2008-03-13 14:28:49.000000000 +0800
+@@ -3,11 +3,11 @@
+  *  License    GPLv2
+  ****************************************************************************/
+ 
++#include "globals.h"
++
+ #include <gtk/gtk.h>
+ #include <gps.h>
+ 
+-#include "globals.h"
+-
+ GdkPixmap *pixmap = NULL;
+ GtkWidget *window1 = NULL;
+ GtkWidget *window2 = NULL;
+Index: tangoGPS-0.7/src/globals.h
+===================================================================
+--- tangoGPS-0.7.orig/src/globals.h	2008-03-13 14:27:46.000000000 +0800
++++ tangoGPS-0.7/src/globals.h	2008-03-13 14:27:48.000000000 +0800
+@@ -1,3 +1,7 @@
++#ifdef HAVE_CONFIG_H
++#  include <config.h>
++#endif
++
+ #include <gtk/gtk.h>
+ #include <gconf/gconf-client.h>
+ 
diff --git a/packages/openmoko-projects/tangogps_0.7.bb b/packages/openmoko-projects/tangogps_0.7.bb
new file mode 100644
index 0000000000..4376156fc5
--- /dev/null
+++ b/packages/openmoko-projects/tangogps_0.7.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "tangoGPS map"
+AUTHOR = "Marcus Bauer <marcus.bauer@gmail.com>"
+HOMEPAGE = "http://tangogps.org/"
+SECTION = "openmoko/pim"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+DEPENDS = "curl gtk+ gpsd"
+PR = "r1"
+
+SRC_URI = "http://tangogps.org/tangoGPS-0.7.tar.gz \
+           file://global-config-h.patch;patch=1"
+
+S = "${WORKDIR}/tangoGPS-0.7"
+
+inherit autotools
diff --git a/packages/packagekit/packagekit_git.bb b/packages/packagekit/packagekit_git.bb
index d4055ead63..5d43c5a1e5 100644
--- a/packages/packagekit/packagekit_git.bb
+++ b/packages/packagekit/packagekit_git.bb
@@ -3,9 +3,9 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool"
-RDEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 opkg"
+RDEPENDS = "opkg"
 PV = "0.1+git${SRCREV}"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "git://anongit.freedesktop.org/git/packagekit;protocol=git \
            file://disable-docbook2man.patch;patch=1"
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 3f1604c4cb..beb72cd4b0 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "OpenMoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r25"
+PR = "r26"
 
 inherit task
 
@@ -42,4 +42,8 @@ RDEPENDS_task-openmoko-feed = "\
   qtopia-phone \
   gnash \
   mono \
+  diversity-daemon \
+  diversity-nav \
+  assassin \
+  tangogps \
 "