[oe-commits] org.oe.dev packages/openmoko-projects/diversity* : diversity updates from OM mtn

[xora commit]

packages/openmoko-projects/diversity* : diversity updates from OM mtn

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 9246f3473a5cb0f2fba69cc0616c39b95c64b322
ViewMTN: http://monotone.openembedded.org/revision/info/9246f3473a5cb0f2fba69cc0616c39b95c64b322
Files:
1
packages/openmoko-projects/diversity-daemon
packages/openmoko-projects/diversity-daemon/no-xmmp.patch
packages/openmoko-projects/diversity-maps-taipei_20080430.bb
packages/openmoko-projects/diversity-maps.inc
packages/openmoko-projects/diversity-daemon_svn.bb
packages/openmoko-projects/diversity-nav_svn.bb
Diffs:

#
# mt diff -rea4dfda5717c53e3f86616577899dd5aab84f214 -r9246f3473a5cb0f2fba69cc0616c39b95c64b322
#
#
#
# add_dir "packages/openmoko-projects/diversity-daemon"
# 
# add_file "packages/openmoko-projects/diversity-daemon/no-xmmp.patch"
#  content [f06801dd8032224db24f159337d273803194afdc]
# 
# add_file "packages/openmoko-projects/diversity-maps-taipei_20080430.bb"
#  content [11b489f90d6c21f5517c296b58d7914d56b1d211]
# 
# add_file "packages/openmoko-projects/diversity-maps.inc"
#  content [8caa0339605461e88ecdadc914d21b7433a508f8]
# 
# patch "packages/openmoko-projects/diversity-daemon_svn.bb"
#  from [2f221ccc7f8ad502be7a83b018be160aa88a2b77]
#    to [e494ec28fd572c5403516cd03277f734eeb45959]
# 
# patch "packages/openmoko-projects/diversity-nav_svn.bb"
#  from [2d3ef31739f95c0422c0d3c57e39f340692a41b9]
#    to [62a724e74403ec3bbbff405d5a988a66e9a2221d]
#
============================================================
--- packages/openmoko-projects/diversity-daemon/no-xmmp.patch	f06801dd8032224db24f159337d273803194afdc
+++ packages/openmoko-projects/diversity-daemon/no-xmmp.patch	f06801dd8032224db24f159337d273803194afdc
@@ -0,0 +1,24 @@
+Index: diversity-xmpp-backend/Makefile.am
+===================================================================
+--- a/diversity-xmpp-backend/Makefile.am	(revision 276)
++++ a/diversity-xmpp-backend/Makefile.am	(working copy)
+@@ -1,3 +1,4 @@
++if HAVE_XMPP
+ INCLUDES = -I${top_srcdir}/include
+ 
+ AM_CPPFLAGS =			\
+@@ -4,9 +5,7 @@
+ 	$(GLIB_CFLAGS)		\
+ 	$(LM_CFLAGS)
+ 
+-if HAVE_XMPP
+ noinst_LTLIBRARIES = libdiversity-xmpp-backend.la
+-endif
+ 
+ noinst_HEADERS = diversity-xmpp-backend.h
+ 
+@@ -48,3 +47,4 @@
+ 
+ xmpp-marshal.h: xmpp-marshal.list
+ 	$(GLIB_GENMARSHAL) --prefix xmpp_marshal --header $< > $@
++endif
============================================================
--- packages/openmoko-projects/diversity-maps-taipei_20080430.bb	11b489f90d6c21f5517c296b58d7914d56b1d211
+++ packages/openmoko-projects/diversity-maps-taipei_20080430.bb	11b489f90d6c21f5517c296b58d7914d56b1d211
@@ -0,0 +1,7 @@
+PR = "r0"
+
+require diversity-maps.inc
+
+MAP_NAME = "Taipei"
+MAP_FN = "taipei.eet"
+MAP_VER = "${PV}"
============================================================
--- packages/openmoko-projects/diversity-maps.inc	8caa0339605461e88ecdadc914d21b7433a508f8
+++ packages/openmoko-projects/diversity-maps.inc	8caa0339605461e88ecdadc914d21b7433a508f8
@@ -0,0 +1,18 @@
+DESCRIPTION = "Diversity Maps - ${MAP_NAME}"
+HOMEPAGE = "http://diversity.projects.openmoko.org/"
+SECTION = "network/misc"
+LICENSE = "Creative Commons Attribution-ShareAlike 2.0"
+
+SRC_URI = "http://people.openmoko.org/olv/diversity/${MAP_VER}/${MAP_FN}"
+
+MAP_DIR = "${datadir}/diversity-nav/maps"
+FILES_${PN} = "${MAP_DIR}/${MAP_FN}"
+
+PACKAGES = "${PN}"
+PACKAGE_ARCH = "all"
+PKG_TAGS_${PN} = "group::maps"
+
+do_install() {
+        install -d ${D}${MAP_DIR}
+        cp -f ${WORKDIR}/${MAP_FN} ${D}${MAP_DIR}
+}
============================================================
--- packages/openmoko-projects/diversity-daemon_svn.bb	2f221ccc7f8ad502be7a83b018be160aa88a2b77
+++ packages/openmoko-projects/diversity-daemon_svn.bb	e494ec28fd572c5403516cd03277f734eeb45959
@@ -3,11 +3,12 @@ DEPENDS = "glib-2.0 dbus dbus-glib eds-d
 SECTION = "network/misc"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus libjana curl"
-RDEPENDS_${PN} = "eds-dbus openmoko-dialer2"
+RDEPENDS_${PN} = "eds-dbus"
 PV = "0.0+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https"
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https \
+           file://no-xmmp.patch;patch=1;minrev=276"
 S = "${WORKDIR}/diversity-daemon"
 
 inherit autotools pkgconfig
============================================================
--- packages/openmoko-projects/diversity-nav_svn.bb	2d3ef31739f95c0422c0d3c57e39f340692a41b9
+++ packages/openmoko-projects/diversity-nav_svn.bb	62a724e74403ec3bbbff405d5a988a66e9a2221d
@@ -2,10 +2,10 @@ LICENSE = "GPL"
 HOMEPAGE = "http://diversity.projects.openmoko.org/"
 SECTION = "openmoko/applications"
 LICENSE = "GPL"
-DEPENDS = "evas edje ecore edbus ewl"
-RDEPENDS_${PN} = "diversity-daemon ewl-themes"
+DEPENDS = "evas edje ecore edbus etk"
+RDEPENDS_${PN} = "diversity-daemon"
 PV = "0.0.1+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-nav;proto=https"