Revert "[openmoko] Change name from Diversity-nav to Om-locations"

This reverts commit 6f244e086c8107d6ce78643081878632c8fc4d33.

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 26b02dc..f0d1989 100644 (file)
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -31,6 +31,7 @@ SRCREV_pn-dbus-c++ ?= "13131"
 SRCREV_pn-dfu-util ?= "4160"
 SRCREV_pn-dfu-util-native ?= "4160"
 SRCREV_pn-diversity-daemon ?= "277"
+SRCREV_pn-diversity-nav ?= "340"
 SRCREV_pn-eds-dbus ?= "659"
 SRCREV_pn-eglibc ?= "6937"
 SRCREV_pn-eglibc-initial ?= "6937"
@@ -107,7 +108,6 @@ SRCREV_pn-netsurf ?= "3859"
 SRCREV_pn-networkmanager ?= "3202"
 SRCREV_pn-networkmanager-applet ?= "200"
 SRCREV_pn-numptyphysics = "45"
-SRCREV_pn-om-locations ?= "524031cdb3cd14a67ff8b7e1192075bf8c6c3373"
 SRCREV_pn-oh-puzzles ?= "22"
 SRCREV_pn-osb-browser ?= "125"
 SRCREV_pn-osb-jscore ?= "117"

diff --git a/packages/openmoko-projects/om-locations_git.bb b/packages/openmoko-projects/om-locations_git.bb
deleted file mode 100644 (file)
index bf9b27e..0000000
--- a/packages/openmoko-projects/om-locations_git.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Locations - a GPS location based communicative application"
-HOMEPAGE = "http://wiki.openmoko.org/wiki/Om2008.8_Locations"
-SECTION = "openmoko/applications"
-LICENSE = "GPL"
-DEPENDS = "eet evas edje ecore edbus etk"
-RDEPENDS_${PN} = "diversity-daemon"
-PV = "0.2+gitr${SRCREV}"
-PR = "r1"
-
-SRC_URI = "git://git.openmoko.org/git/om-locations.git;protocol=git"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
-
-do_configure_prepend() {
-       autopoint --force
-}
-
-PKG_TAGS_${PN} = "group::communication"

diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 92fdd47..40e9758 100644 (file)
--- 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 = "r42"
 
 inherit task
 
@@ -49,7 +49,6 @@ RDEPENDS_task-openmoko-feed = "\
   mono \
 #  diversity-daemon \
 #  diversity-maps-taipei \
-  om-locations \
 #  om-maps-berlin \
 #  om-maps-buenos-aires \
 #  om-maps-london \