13 files changed, 113 insertions, 21 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index d5d8df8172..335fe7cb3b 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -11494,6 +11494,42 @@ sha256=b935aaf1e389f767ba8238c7a5c0b4387a345168acddf4f38bb6914149953a28
 md5=593c0861fa10d2a8d0e7d8617479c5cf
 sha256=b3404a5a5dd78c0e1ba12b8aa1445589fa7861fa4d9ecafb53b38be760876913
 
+[http://people.openmoko.org/olv/om-maps/20080430/om-maps-berlin-20080430.eet]
+md5=25b515f30606b3f78d5d77c96663185d
+sha256=3ebb791e9bf6b00127b4961d8f15b4d1e48d209468b01365300d3ea5a5cacf37
+
+[http://people.openmoko.org/olv/om-maps/20080430/om-maps-buenos-aires-20080430.eet]
+md5=306c1d9537f510b30273a030f5ace118
+sha256=8486baf16bbc6dd4ad3820330a28546996f9383de96c1b6bf784999dcf4b712e
+
+[http://people.openmoko.org/olv/om-maps/20080430/om-maps-london-20080430.eet]
+md5=fa05427d09f98ea6cbceaa4c88f4c51d
+sha256=1776ba1ec93984d0ff755a677a769e200a6e435fd1385e699e106c9cec83b04c
+
+[http://people.openmoko.org/olv/om-maps/20080430/om-maps-new-york-20080430.eet]
+md5=3fd0065397e6ae78d43b159a3e9d3660
+sha256=43df4b1407baf3b647e30abf7e5461d86c3145d6df21f4d27a2fb2d8b2b08ec9
+
+[http://people.openmoko.org/olv/om-maps/20080430/om-maps-paris-20080430.eet]
+md5=f93c90a1cfaf3113a1577331582c0cd1
+sha256=b27f67834142417e35dc911fa51f13595bb3271800b9963ed481749bbb17466b
+
+[http://people.openmoko.org/olv/om-maps/20080430/om-maps-providence-20080430.eet]
+md5=105cd93f37409631fd99d23cdd033420
+sha256=ca2a91115445ce8dfb758099158e31425695181909e94f928feef6077a6cba0a
+
+[http://people.openmoko.org/olv/om-maps/20080430/om-maps-san-francisco-20080430.eet]
+md5=c23e48390885391a3b403c8d7863e031
+sha256=a7f00540ac487fa26050a2aaf5a9b7fbb82af0a32c6f5d60043d4228a652151e
+
+[http://people.openmoko.org/olv/om-maps/20080430/om-maps-sydney-20080430.eet]
+md5=5b83060995bade39a80dafb83571f627
+sha256=66150243fa43052fc762ec1d5d141b44c98a49bec49f726c7db7c54968d605c5
+
+[http://people.openmoko.org/olv/om-maps/20080430/om-maps-taipei-20080430.eet]
+md5=5e82e0fb27f1ae480c5099f3bd572cf3
+sha256=5dafd06260fe58847fb92f2e063f8fb0ae8ad4a3fb082f0871217d3ba88b162c
+
 [http://downloads.sourceforge.net/omniorb/omniORB-4.0.7.tar.gz]
 md5=9d478031be34232e988f3d5874396499
 sha256=e4c0875794a74ac627b7b74b6098e75c8413bd156856dc434a49c4c112a68af2
diff --git a/packages/openmoko-projects/diversity-maps-taipei_20080430.bb b/packages/openmoko-projects/diversity-maps-taipei_20080430.bb
deleted file mode 100644
index c882963fb2..0000000000
--- a/packages/openmoko-projects/diversity-maps-taipei_20080430.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-PR = "r0"
-
-require diversity-maps.inc
-
-MAP_NAME = "Taipei"
-MAP_FN = "taipei.eet"
-MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-berlin_20080430.bb b/packages/openmoko-projects/om-maps-berlin_20080430.bb
new file mode 100644
index 0000000000..01120d1ce7
--- /dev/null
+++ b/packages/openmoko-projects/om-maps-berlin_20080430.bb
@@ -0,0 +1,7 @@
+PR = "r0"
+
+require om-maps.inc
+
+MAP_NAME = "Berlin"
+MAP_FN = "om-maps-berlin-${PV}.eet"
+MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-buenos-aires_20080430.bb b/packages/openmoko-projects/om-maps-buenos-aires_20080430.bb
new file mode 100644
index 0000000000..ed1cc60bb7
--- /dev/null
+++ b/packages/openmoko-projects/om-maps-buenos-aires_20080430.bb
@@ -0,0 +1,7 @@
+PR = "r0"
+
+require om-maps.inc
+
+MAP_NAME = "Buenos Aires"
+MAP_FN = "om-maps-buenos-aires-${PV}.eet"
+MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-london_20080430.bb b/packages/openmoko-projects/om-maps-london_20080430.bb
new file mode 100644
index 0000000000..343c569414
--- /dev/null
+++ b/packages/openmoko-projects/om-maps-london_20080430.bb
@@ -0,0 +1,7 @@
+PR = "r0"
+
+require om-maps.inc
+
+MAP_NAME = "London"
+MAP_FN = "om-maps-london-${PV}.eet"
+MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-new-york_20080430.bb b/packages/openmoko-projects/om-maps-new-york_20080430.bb
new file mode 100644
index 0000000000..da00649954
--- /dev/null
+++ b/packages/openmoko-projects/om-maps-new-york_20080430.bb
@@ -0,0 +1,7 @@
+PR = "r0"
+
+require om-maps.inc
+
+MAP_NAME = "New York"
+MAP_FN = "om-maps-new-york-${PV}.eet"
+MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-paris_20080430.bb b/packages/openmoko-projects/om-maps-paris_20080430.bb
new file mode 100644
index 0000000000..2b1cfa4b8e
--- /dev/null
+++ b/packages/openmoko-projects/om-maps-paris_20080430.bb
@@ -0,0 +1,7 @@
+PR = "r0"
+
+require om-maps.inc
+
+MAP_NAME = "Paris"
+MAP_FN = "om-maps-paris-${PV}.eet"
+MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-providence_20080430.bb b/packages/openmoko-projects/om-maps-providence_20080430.bb
new file mode 100644
index 0000000000..361107755c
--- /dev/null
+++ b/packages/openmoko-projects/om-maps-providence_20080430.bb
@@ -0,0 +1,7 @@
+PR = "r0"
+
+require om-maps.inc
+
+MAP_NAME = "Providence"
+MAP_FN = "om-maps-providence-${PV}.eet"
+MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-san-francisco_20080430.bb b/packages/openmoko-projects/om-maps-san-francisco_20080430.bb
new file mode 100644
index 0000000000..9aa2da00d9
--- /dev/null
+++ b/packages/openmoko-projects/om-maps-san-francisco_20080430.bb
@@ -0,0 +1,7 @@
+PR = "r0"
+
+require om-maps.inc
+
+MAP_NAME = "San Francisco"
+MAP_FN = "om-maps-san-francisco-${PV}.eet"
+MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-sydney_20080430.bb b/packages/openmoko-projects/om-maps-sydney_20080430.bb
new file mode 100644
index 0000000000..0f892ca429
--- /dev/null
+++ b/packages/openmoko-projects/om-maps-sydney_20080430.bb
@@ -0,0 +1,7 @@
+PR = "r0"
+
+require om-maps.inc
+
+MAP_NAME = "Sydney"
+MAP_FN = "om-maps-sydney-${PV}.eet"
+MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-taipei_20080430.bb b/packages/openmoko-projects/om-maps-taipei_20080430.bb
new file mode 100644
index 0000000000..3ff7cf32b1
--- /dev/null
+++ b/packages/openmoko-projects/om-maps-taipei_20080430.bb
@@ -0,0 +1,7 @@
+PR = "r0"
+
+require om-maps.inc
+
+MAP_NAME = "Taipei"
+MAP_FN = "om-maps-taipei-${PV}.eet"
+MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/diversity-maps.inc b/packages/openmoko-projects/om-maps.inc
index 9af5e95d95..a714670930 100644
--- a/packages/openmoko-projects/diversity-maps.inc
+++ b/packages/openmoko-projects/om-maps.inc
@@ -1,11 +1,11 @@
-DESCRIPTION = "Diversity Maps - ${MAP_NAME}"
+DESCRIPTION = "Map of ${MAP_NAME}, for use with Locations application"
 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}"
+SRC_URI = "http://people.openmoko.org/olv/om-maps/${MAP_VER}/${MAP_FN}"
 
-MAP_DIR = "${datadir}/diversity-nav/maps"
+MAP_DIR = "${datadir}/om-maps"
 FILES_${PN} = "${MAP_DIR}/${MAP_FN}"
 
 PACKAGES = "${PN}"
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 92fdd4715c..21c9cbf9ed 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 = "r43"
+PR = "r44"
 
 inherit task
 
@@ -49,17 +49,17 @@ RDEPENDS_task-openmoko-feed = "\
   mono \
 #  diversity-daemon \
 #  diversity-maps-taipei \
+  om-maps-berlin \
+  om-maps-buenos-aires \
+  om-maps-london \
+  om-maps-new-york \
+  om-maps-paris \
+  om-maps-providence \
+  om-maps-san-francisco \
+  om-maps-sydney \
+  om-maps-taipei \
   om-locations \
-#  om-maps-berlin \
-#  om-maps-buenos-aires \
-#  om-maps-london \
-#  om-maps-new-york \
-#  om-maps-paris \
-#  om-maps-providence \
-#  om-maps-san-francisco \
-#  om-maps-sydney \
-#  om-maps-taipei \
-#  om-settings \
+  om-settings \
   assassin \
 #  assassin-thumbnail \
   tangogps \