openmoko: Rename from diversity-maps-* to om-maps-* Splinter had rename to om-locations. Therefore we also rename those maps.

Update checksum for those maps

12 files changed, 77 insertions, 21 deletions

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 \