From 81d6c289e44817d37ab3482629c35016b8fc9704 Mon Sep 17 00:00:00 2001
From: Julian_chu <julian_chu@openmoko.com>
Date: Fri, 29 Aug 2008 04:20:15 +0800
Subject: tichy: Apply Charlie's change

---
 packages/openmoko-projects/tichy_svn.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/openmoko-projects/tichy_svn.bb b/packages/openmoko-projects/tichy_svn.bb
index 4b8fe5eeb3..5c54dbad3e 100644
--- a/packages/openmoko-projects/tichy_svn.bb
+++ b/packages/openmoko-projects/tichy_svn.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "Python applets manager"
 SECTION = "x11"
 LICENSE = "GPL"
-DEPENDS = "python-pygame"
+DEPENDS += "python-pygame virtual/libsdl libsdl-image python-dbus python-pygobject"                                   
 PV = "0.1+svnr${SRCREV}"
-PR = "r0"
+PR = "r0.01"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot;module=tichy;proto=http"
 S = "${WORKDIR}/tichy"
@@ -12,3 +12,5 @@ inherit distutils
 
 FILES_${PN} += "${datadir}"
 RDEPENDS_${PN} += "python-pygame"
+# This is because pkg-config --libs --cflags sdl doesn't return the correct path (bug in libsdl recipe ?)
+CFLAGS += -I${STAGING_INCDIR}/SDL
-- 
cgit v1.2.3


From 2a8ed0def53b9534ab048f63f05eb0d4d84eb1f9 Mon Sep 17 00:00:00 2001
From: Julian_chu <julian_chu@openmoko.com>
Date: Wed, 2 Jul 2008 14:06:10 +0800
Subject: Assassin: Add curl to assassin's depends. Tick did a quick hack to
 assassin for access networking. It's is a temporary solution.

After the real solution has been done, this dependency will
be remvoed.
---
 packages/openmoko-projects/assassin_svn.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/openmoko-projects/assassin_svn.bb b/packages/openmoko-projects/assassin_svn.bb
index 32c976df7a..68ab6050ac 100644
--- a/packages/openmoko-projects/assassin_svn.bb
+++ b/packages/openmoko-projects/assassin_svn.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "Action GUI for Installer"
 HOMEPAGE = "http://assassin.projects.openmoko.org/"
 LICENSE = "GPL"
-DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus eet"
+DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus eet curl"
+RDEPENDS = "etk-theme-ninja"
 PV = "0.2+svnr${SRCREV}"
-PR = "r6"
+PR = "r6.02"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https"
 
-- 
cgit v1.2.3


From db87d7205c7acf70e4c096bb9e128c0b3d1c0fa2 Mon Sep 17 00:00:00 2001
From: Julian_chu <julian_chu@openmoko.com>
Date: Wed, 16 Jul 2008 17:08:11 +0800
Subject: assassin: Remove curl in DEPENDS of assassin

---
 packages/openmoko-projects/assassin_svn.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/openmoko-projects/assassin_svn.bb b/packages/openmoko-projects/assassin_svn.bb
index 68ab6050ac..f1fc18047a 100644
--- a/packages/openmoko-projects/assassin_svn.bb
+++ b/packages/openmoko-projects/assassin_svn.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "Action GUI for Installer"
 HOMEPAGE = "http://assassin.projects.openmoko.org/"
 LICENSE = "GPL"
-DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus eet curl"
+DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus eet"
 RDEPENDS = "etk-theme-ninja"
 PV = "0.2+svnr${SRCREV}"
-PR = "r6.02"
+PR = "r6.03"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https"
 
-- 
cgit v1.2.3


From f848d38a33dd6808e9cb8bcbab1df54bdb83efcd Mon Sep 17 00:00:00 2001
From: Julian_chu <julian_chu@openmoko.com>
Date: Thu, 31 Jul 2008 21:53:02 +0800
Subject: assassin: Change the source URI of assassin For some experimental
 reason, Assassin is going to move to code google.

Bump up the reversion of assassin to 217
---
 packages/openmoko-projects/assassin_svn.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages')

diff --git a/packages/openmoko-projects/assassin_svn.bb b/packages/openmoko-projects/assassin_svn.bb
index f1fc18047a..c2ab9579a3 100644
--- a/packages/openmoko-projects/assassin_svn.bb
+++ b/packages/openmoko-projects/assassin_svn.bb
@@ -4,11 +4,11 @@ LICENSE = "GPL"
 DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus eet"
 RDEPENDS = "etk-theme-ninja"
 PV = "0.2+svnr${SRCREV}"
-PR = "r6.03"
+PR = "r6.04"
 
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https"
+SRC_URI = "svn://om-assassin.googlecode.com/svn/;module=trunk;proto=http"
 
-S = "${WORKDIR}/assassin"
+S = "${WORKDIR}/trunk"
 
 inherit autotools pkgconfig
 
-- 
cgit v1.2.3


From ab618c09f76d4d2c6d3b94588413eb5757c8c1d2 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@openmoko.org>
Date: Tue, 8 Jul 2008 15:43:18 +0200
Subject: assassin-thumbnail: Add tick's assassin-thumbnail recipe

---
 packages/openmoko-projects/assassin-thumbnail.bb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 packages/openmoko-projects/assassin-thumbnail.bb

(limited to 'packages')

diff --git a/packages/openmoko-projects/assassin-thumbnail.bb b/packages/openmoko-projects/assassin-thumbnail.bb
new file mode 100644
index 0000000000..ece6662b91
--- /dev/null
+++ b/packages/openmoko-projects/assassin-thumbnail.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Assassin Packages Thumbnails"
+HOMEPAGE = "http://assassin.projects.openmoko.org/"
+PKG_TAGS_${PN} = "group::unknown"
+LICENSE = "GPL"
+RDEPENDS = "assassin"
+PV = "0.1+svnr${SRCPV}"
+PR = "r0"
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target/thumbnails/;module=result;proto=https"
+
+do_install() {
+        install -d ${D}${THUMBNAIL_DIR}
+        cp -f ${WORKDIR}/result/${THUMBNAIL_FN} ${D}${THUMBNAIL_DIR}
+}
+
+FILES_${PN} = "${THUMBNAIL_DIR}/${THUMBNAIL_FN}"
+
+THUMBNAIL_DIR = "${datadir}/assassin/"
+THUMBNAIL_FN = "thumbnail.eet"
-- 
cgit v1.2.3


From bb285555551187097e62706ffd7f817893c681c4 Mon Sep 17 00:00:00 2001
From: Julian_chu <julian_chu@openmoko.com>
Date: Thu, 21 Aug 2008 12:36:27 +0800
Subject: openmoko: Change name from Diversity-nav to Om-locations Diversity
 project decided to change the name of diversity-nav to om-locations and move
 the repository from svn to git.

* Remove diverisyt-nav recipe.
* Add om-locations recipe.
* Change name in tasks-*.bb
---
 packages/openmoko-projects/om-locations_git.bb | 22 ++++++++++++++++++++++
 packages/tasks/task-openmoko-feed.bb           |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 packages/openmoko-projects/om-locations_git.bb

(limited to 'packages')

diff --git a/packages/openmoko-projects/om-locations_git.bb b/packages/openmoko-projects/om-locations_git.bb
new file mode 100644
index 0000000000..bf9b27ecb4
--- /dev/null
+++ b/packages/openmoko-projects/om-locations_git.bb
@@ -0,0 +1,22 @@
+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 40e97585ea..92fdd4715c 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 = "r42"
+PR = "r43"
 
 inherit task
 
@@ -49,6 +49,7 @@ RDEPENDS_task-openmoko-feed = "\
   mono \
 #  diversity-daemon \
 #  diversity-maps-taipei \
+  om-locations \
 #  om-maps-berlin \
 #  om-maps-buenos-aires \
 #  om-maps-london \
-- 
cgit v1.2.3


From 08e6e32fc33c3d264b0ef883a9efe4ff237ad2ff Mon Sep 17 00:00:00 2001
From: Julian_chu <julian_chu@openmoko.com>
Date: Wed, 3 Sep 2008 10:37:19 +0800
Subject: om-locations: Set om-locations to use 0.2 branch of om-locations git.
 and bump up the revision to 5cdea8da38561348d4cca6726098afb61d8299eb

---
 packages/openmoko-projects/om-locations_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/openmoko-projects/om-locations_git.bb b/packages/openmoko-projects/om-locations_git.bb
index bf9b27ecb4..50a2de9593 100644
--- a/packages/openmoko-projects/om-locations_git.bb
+++ b/packages/openmoko-projects/om-locations_git.bb
@@ -5,9 +5,9 @@ LICENSE = "GPL"
 DEPENDS = "eet evas edje ecore edbus etk"
 RDEPENDS_${PN} = "diversity-daemon"
 PV = "0.2+gitr${SRCREV}"
-PR = "r1"
+PR = "r1.01"
 
-SRC_URI = "git://git.openmoko.org/git/om-locations.git;protocol=git"
+SRC_URI = "git://git.openmoko.org/git/om-locations.git;protocol=git;branch=0.2"
 
 S = "${WORKDIR}/git"
 
-- 
cgit v1.2.3


From cc4d49defb9e053662043833b68cdf20bf83d909 Mon Sep 17 00:00:00 2001
From: Julian_chu <julian_chu@openmoko.com>
Date: Wed, 3 Sep 2008 10:37:19 +0800
Subject: om-locations: Set om-locations to use 0.2 branch of om-locations git.
 and bump up the revision to 5cdea8da38561348d4cca6726098afb61d8299eb

---
 packages/openmoko-projects/om-locations_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/openmoko-projects/om-locations_git.bb b/packages/openmoko-projects/om-locations_git.bb
index 50a2de9593..763c6ee4c6 100644
--- a/packages/openmoko-projects/om-locations_git.bb
+++ b/packages/openmoko-projects/om-locations_git.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "eet evas edje ecore edbus etk"
 RDEPENDS_${PN} = "diversity-daemon"
 PV = "0.2+gitr${SRCREV}"
-PR = "r1.01"
+PR = "r1.02"
 
 SRC_URI = "git://git.openmoko.org/git/om-locations.git;protocol=git;branch=0.2"
 
-- 
cgit v1.2.3


From 841fc87590d275646575050fd28baf157589c813 Mon Sep 17 00:00:00 2001
From: Julian_chu <julian_chu@openmoko.com>
Date: Mon, 22 Sep 2008 18:13:39 +0800
Subject: om-locations: Switch back to master branch After Om2008.9 released,
 switch om-locations back to master branch.

* Change SRC_URI
* Bump up the revision to 28d56a504a41261c363c085a38f81721cdd6683e
* Remove om-locations_svn.bb (it is no longer on svn)
---
 packages/openmoko-projects/om-locations_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/openmoko-projects/om-locations_git.bb b/packages/openmoko-projects/om-locations_git.bb
index 763c6ee4c6..a25a3e21ba 100644
--- a/packages/openmoko-projects/om-locations_git.bb
+++ b/packages/openmoko-projects/om-locations_git.bb
@@ -5,9 +5,9 @@ LICENSE = "GPL"
 DEPENDS = "eet evas edje ecore edbus etk"
 RDEPENDS_${PN} = "diversity-daemon"
 PV = "0.2+gitr${SRCREV}"
-PR = "r1.02"
+PR = "r1.03"
 
-SRC_URI = "git://git.openmoko.org/git/om-locations.git;protocol=git;branch=0.2"
+SRC_URI = "git://git.openmoko.org/git/om-locations.git;protocol=git"
 
 S = "${WORKDIR}/git"
 
-- 
cgit v1.2.3


From 365804d1722adaf0b3c3121c6683219326c323ed Mon Sep 17 00:00:00 2001
From: Julian_chu <julian_chu@openmoko.com>
Date: Tue, 3 Jun 2008 19:44:14 +0800
Subject: diversity: Add diversity-radar, a GPS location based communicative
 application [sane-srcrevs] Add version of diversity-radar to 405

---
 packages/openmoko-projects/diversity-radar_svn.bb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 packages/openmoko-projects/diversity-radar_svn.bb

(limited to 'packages')

diff --git a/packages/openmoko-projects/diversity-radar_svn.bb b/packages/openmoko-projects/diversity-radar_svn.bb
new file mode 100644
index 0000000000..446c449c72
--- /dev/null
+++ b/packages/openmoko-projects/diversity-radar_svn.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Diversity_radar - a GPS location based communicative application"
+HOMEPAGE = "http://diversity.projects.openmoko.org/"
+SECTION = "openmoko/applications"
+LICENSE = "GPL"
+DEPENDS = "python-evas python-edje python-ecore python-edbus python-dbus python-etk"
+RDEPENDS_${PN} = "diversity-daemon"
+PV = "0.0.4+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/toys;module=diversity-radar;proto=http"
+
+S = "${WORKDIR}/${PN}"
+
+inherit setuptools
+
+PACKAGES = "${PN}"
+
+FILES_${PN} += "${prefix}/share/*"
+
+PKG_TAGS_${PN} = "group::communication"
-- 
cgit v1.2.3


From e8aa71fc8ef13470222d7bb4e85595d75d09263c Mon Sep 17 00:00:00 2001
From: Julian_chu <julian_chu@openmoko.com>
Date: Tue, 3 Jun 2008 19:56:50 +0800
Subject: diversity: remove PACKAGES = "${PN}" from diversity-radar

---
 packages/openmoko-projects/diversity-radar_svn.bb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'packages')

diff --git a/packages/openmoko-projects/diversity-radar_svn.bb b/packages/openmoko-projects/diversity-radar_svn.bb
index 446c449c72..d7163f1f21 100644
--- a/packages/openmoko-projects/diversity-radar_svn.bb
+++ b/packages/openmoko-projects/diversity-radar_svn.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "python-evas python-edje python-ecore python-edbus python-dbus python-etk"
 RDEPENDS_${PN} = "diversity-daemon"
 PV = "0.0.4+svnr${SRCREV}"
-PR = "r0"
+PR = "r0.01"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/toys;module=diversity-radar;proto=http"
 
@@ -13,8 +13,6 @@ S = "${WORKDIR}/${PN}"
 
 inherit setuptools
 
-PACKAGES = "${PN}"
-
 FILES_${PN} += "${prefix}/share/*"
 
 PKG_TAGS_${PN} = "group::communication"
-- 
cgit v1.2.3


From ab53c55e514a442ddea7201942575cb991af7629 Mon Sep 17 00:00:00 2001
From: Julian_chu <julian_chu@openmoko.com>
Date: Fri, 6 Jun 2008 23:15:40 +0800
Subject: openmoko: add Openmoko community repository bbfile. It create a
 configure file in rootfs for opkg.

---
 .../openmoko-community-repository.bb                | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 packages/openmoko-projects/openmoko-community-repository.bb

(limited to 'packages')

diff --git a/packages/openmoko-projects/openmoko-community-repository.bb b/packages/openmoko-projects/openmoko-community-repository.bb
new file mode 100644
index 0000000000..ca3ffc4fae
--- /dev/null
+++ b/packages/openmoko-projects/openmoko-community-repository.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Configuration files for online package repositories of Openmoko community repository feeds"
+PR = "r0"
+
+do_compile() {
+    mkdir -p ${S}/${sysconfdir}/opkg
+    for feed in community-repository; do
+        echo "src/gz daily-${feed} ${OPENMOKO_URI}/${feed}" > ${S}/${sysconfdir}/opkg/${feed}-feed.conf
+    done
+}
+do_install () {
+        install -d ${D}${sysconfdir}/opkg
+        install -m 0644  ${S}/${sysconfdir}/opkg/* ${D}${sysconfdir}/opkg/
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+CONFFILES_${PN} += "${sysconfdir}/opkg/community-repository-feed.conf"
+
+PKG_TAGS_${PN} = "group::repos"
+
+OPENMOKO_URI = "http://downloads.openmoko.org"
-- 
cgit v1.2.3


From 9c4503e642461c0f279d32208f98018c688adf30 Mon Sep 17 00:00:00 2001
From: Julian_chu <julian_chu@openmoko.com>
Date: Wed, 6 Aug 2008 00:15:28 +0800
Subject: openmoko: Change default community repository set
 http://downloads.openmoko.org/repository/Multiverse/ as a default repository
 for community

---
 packages/openmoko-projects/openmoko-community-repository.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages')

diff --git a/packages/openmoko-projects/openmoko-community-repository.bb b/packages/openmoko-projects/openmoko-community-repository.bb
index ca3ffc4fae..1ac14d3989 100644
--- a/packages/openmoko-projects/openmoko-community-repository.bb
+++ b/packages/openmoko-projects/openmoko-community-repository.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "Configuration files for online package repositories of Openmoko community repository feeds"
-PR = "r0"
+PR = "r0.01"
 
 do_compile() {
     mkdir -p ${S}/${sysconfdir}/opkg
-    for feed in community-repository; do
+    for feed in Multiverse; do
         echo "src/gz daily-${feed} ${OPENMOKO_URI}/${feed}" > ${S}/${sysconfdir}/opkg/${feed}-feed.conf
     done
 }
@@ -18,4 +18,4 @@ CONFFILES_${PN} += "${sysconfdir}/opkg/community-repository-feed.conf"
 
 PKG_TAGS_${PN} = "group::repos"
 
-OPENMOKO_URI = "http://downloads.openmoko.org"
+OPENMOKO_URI = "http://downloads.openmoko.org/repository/"
-- 
cgit v1.2.3


From aa76b93535c4562eead2f300415784098f7bcfaa Mon Sep 17 00:00:00 2001
From: Julian_chu <julian_chu@openmoko.com>
Date: Tue, 12 Aug 2008 11:25:55 +0800
Subject: openmoko-community-repository: Modify the URL Remove the duplicate
 slash

---
 packages/openmoko-projects/openmoko-community-repository.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/openmoko-projects/openmoko-community-repository.bb b/packages/openmoko-projects/openmoko-community-repository.bb
index 1ac14d3989..f652e0e6a5 100644
--- a/packages/openmoko-projects/openmoko-community-repository.bb
+++ b/packages/openmoko-projects/openmoko-community-repository.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Configuration files for online package repositories of Openmoko community repository feeds"
-PR = "r0.01"
+PR = "r0.02"
 
 do_compile() {
     mkdir -p ${S}/${sysconfdir}/opkg
@@ -18,4 +18,4 @@ CONFFILES_${PN} += "${sysconfdir}/opkg/community-repository-feed.conf"
 
 PKG_TAGS_${PN} = "group::repos"
 
-OPENMOKO_URI = "http://downloads.openmoko.org/repository/"
+OPENMOKO_URI = "http://downloads.openmoko.org/repository"
-- 
cgit v1.2.3


From c942e2ee2c59bd2808a68379b4271f69df0013b2 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@openmoko.org>
Date: Tue, 5 Aug 2008 23:38:51 +0200
Subject: openmoko: Fix the feed configuration Make the package buildable again

---
 packages/openmoko-projects/openmoko-community-repository.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/openmoko-projects/openmoko-community-repository.bb b/packages/openmoko-projects/openmoko-community-repository.bb
index f652e0e6a5..d866558fb3 100644
--- a/packages/openmoko-projects/openmoko-community-repository.bb
+++ b/packages/openmoko-projects/openmoko-community-repository.bb
@@ -14,7 +14,7 @@ do_install () {
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-CONFFILES_${PN} += "${sysconfdir}/opkg/community-repository-feed.conf"
+CONFFILES_${PN} += "${sysconfdir}/opkg/Multiverse-feed.conf"
 
 PKG_TAGS_${PN} = "group::repos"
 
-- 
cgit v1.2.3


From 5a0c6dce019eb166571df683c6a15c351db78b3b Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@openmoko.org>
Date: Sun, 3 Aug 2008 14:08:29 +0200
Subject: asu: Create ASU/Om2008.8 task and image (to ease removing Qtopia from
 it) Create a separate task-openmoko-asu and openmoko-asu-image. The image is
 installing task-openmoko-asu and task-openmoko-qtopia-x11. It should be
 fairly easy to remove Qtopia for the people that want that.

---
 packages/images/openmoko-asu-image.bb |  7 ++++++
 packages/tasks/task-openmoko-asu.bb   | 45 +++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 packages/images/openmoko-asu-image.bb
 create mode 100644 packages/tasks/task-openmoko-asu.bb

(limited to 'packages')

diff --git a/packages/images/openmoko-asu-image.bb b/packages/images/openmoko-asu-image.bb
new file mode 100644
index 0000000000..2a8896c592
--- /dev/null
+++ b/packages/images/openmoko-asu-image.bb
@@ -0,0 +1,7 @@
+#------------------------------------------------------
+# Openmoko Qtopia/X11 Image Recipe
+#------------------------------------------------------
+
+require openmoko-minimal-image.bb
+
+IMAGE_INSTALL += "task-openmoko-asu"
diff --git a/packages/tasks/task-openmoko-asu.bb b/packages/tasks/task-openmoko-asu.bb
new file mode 100644
index 0000000000..af17e456d8
--- /dev/null
+++ b/packages/tasks/task-openmoko-asu.bb
@@ -0,0 +1,45 @@
+DESCRIPTION = "Openmoko: Om 2008.8 August Software Update"
+
+SECTION = "openmoko/base"
+ALLOW_EMPTY = "1"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+LICENSE = "MIT"
+PR = "r2"
+
+inherit task
+
+PACKAGES = "task-openmoko-asu"
+RDEPENDS_task-openmoko-asu = "\
+  bluez-hcidump \
+  readline \
+  connman \
+  connman-plugin-connman-resolvconf \
+  connman-plugin-connman-dhclient \
+  connman-plugin-connman-80211 \
+  connman-script-dhclient \
+  e-wm \
+  illume \
+  illume-theme \
+  assassin \
+  diversity-daemon \
+  om-locations \
+  ${XSERVER} \
+  xserver-kdrive-common \
+  xserver-nodm-init \
+  xauth \
+  xhost \
+  xset \
+  xrandr \
+  libnotify \
+  exposure \
+  etk-theme-ninja \
+  openmoko-community-repository \
+  assassin-thumbnail \
+  pyefl-sudoku \
+  \
+# For supporting the om2007.2 stack
+  openmoko-icon-theme-standard2 \
+  moko-gtk-engine \
+  settings-daemon \
+  openmoko-asu-om20072-support \
+"
-- 
cgit v1.2.3


From 9e6f78b14f55cf97bdf4be02905b8736cf4c027e Mon Sep 17 00:00:00 2001
From: "julian_chu@openmoko.com" <julian_chu@openmoko.com>
Date: Tue, 13 May 2008 08:34:41 +0000
Subject: Add Exposure, a setting application

---
 packages/openmoko-projects/exposure_svn.bb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 packages/openmoko-projects/exposure_svn.bb

(limited to 'packages')

diff --git a/packages/openmoko-projects/exposure_svn.bb b/packages/openmoko-projects/exposure_svn.bb
new file mode 100644
index 0000000000..56679089c1
--- /dev/null
+++ b/packages/openmoko-projects/exposure_svn.bb
@@ -0,0 +1,17 @@
+AUTHOR = "Willie <willie@openmoko.com>"
+DESCRIPTION = "Exposure all devices on neo1973"
+DEPENDS = "python-etk"
+RDEPENDS = "python-etk python-re python-codecs"
+PV = "0.0.1+svnr${SRCREV}"
+SRCREV = ${AUTOREV}
+PR = "r0"
+
+S = ${WORKDIR}/${PN}
+
+inherit setuptools
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot;module=exposure;proto=http"
+
+
+PACKAGES = "${PN}"
+
+FILES_${PN} += "${prefix}/share/*"
-- 
cgit v1.2.3


From 888fc72513262f6362b71d0d8212af5b5fd2451b Mon Sep 17 00:00:00 2001
From: Graeme Gregory <graeme@openmoko.org>
Date: Tue, 20 May 2008 22:23:01 +0100
Subject: exposure_svn.bb : tidy recipe and remove AUTOREV that doesnt belong

---
 packages/openmoko-projects/exposure_svn.bb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'packages')

diff --git a/packages/openmoko-projects/exposure_svn.bb b/packages/openmoko-projects/exposure_svn.bb
index 56679089c1..296ab64e6e 100644
--- a/packages/openmoko-projects/exposure_svn.bb
+++ b/packages/openmoko-projects/exposure_svn.bb
@@ -1,10 +1,9 @@
-AUTHOR = "Willie <willie@openmoko.com>"
 DESCRIPTION = "Exposure all devices on neo1973"
+AUTHOR = "Willie <willie@openmoko.com>"
 DEPENDS = "python-etk"
 RDEPENDS = "python-etk python-re python-codecs"
 PV = "0.0.1+svnr${SRCREV}"
-SRCREV = ${AUTOREV}
-PR = "r0"
+PR = "r1"
 
 S = ${WORKDIR}/${PN}
 
-- 
cgit v1.2.3


From ddf3cdb972c887a24245ff72e156e5a0e1f8788c Mon Sep 17 00:00:00 2001
From: Julian_chu <julian_chu@openmoko.com>
Date: Mon, 9 Jun 2008 14:26:16 +0800
Subject: exposure: As Marek's request. Add python-dbus to exposure

---
 packages/openmoko-projects/exposure_svn.bb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'packages')

diff --git a/packages/openmoko-projects/exposure_svn.bb b/packages/openmoko-projects/exposure_svn.bb
index 296ab64e6e..248c818869 100644
--- a/packages/openmoko-projects/exposure_svn.bb
+++ b/packages/openmoko-projects/exposure_svn.bb
@@ -1,11 +1,10 @@
 DESCRIPTION = "Exposure all devices on neo1973"
-AUTHOR = "Willie <willie@openmoko.com>"
-DEPENDS = "python-etk"
-RDEPENDS = "python-etk python-re python-codecs"
+DEPENDS = "python-etk python-dbus"
+RDEPENDS = "python-etk python-re python-codecs python-dbus"
 PV = "0.0.1+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
-S = ${WORKDIR}/${PN}
+S = "${WORKDIR}/${PN}"
 
 inherit setuptools
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot;module=exposure;proto=http"
-- 
cgit v1.2.3


From bf7ddf5179074ebe0765eeaab0116c12b7ec8fb1 Mon Sep 17 00:00:00 2001
From: Julian_chu <julian_chu@openmoko.com>
Date: Wed, 11 Jun 2008 19:01:38 +0800
Subject: exposure: Bump up reversion of exposure to 30. Files layout of
 exposure was chaged in upstream. Therefore I chage a little of exposure
 bbfile.

---
 packages/openmoko-projects/exposure_svn.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages')

diff --git a/packages/openmoko-projects/exposure_svn.bb b/packages/openmoko-projects/exposure_svn.bb
index 248c818869..ab9e691cc6 100644
--- a/packages/openmoko-projects/exposure_svn.bb
+++ b/packages/openmoko-projects/exposure_svn.bb
@@ -2,12 +2,12 @@ DESCRIPTION = "Exposure all devices on neo1973"
 DEPENDS = "python-etk python-dbus"
 RDEPENDS = "python-etk python-re python-codecs python-dbus"
 PV = "0.0.1+svnr${SRCREV}"
-PR = "r2"
+PR = "r2.01"
 
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/trunk"
 
 inherit setuptools
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot;module=exposure;proto=http"
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/exposure;module=trunk;proto=http"
 
 
 PACKAGES = "${PN}"
-- 
cgit v1.2.3


From 96a9020b9c3a11cd3194e5a4959b8f294880774e Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@openmoko.org>
Date: Tue, 24 Jun 2008 09:09:00 +0200
Subject: srcrev: Upgrade exposure to be launchable again

---
 packages/openmoko-projects/exposure_svn.bb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'packages')

diff --git a/packages/openmoko-projects/exposure_svn.bb b/packages/openmoko-projects/exposure_svn.bb
index ab9e691cc6..14093a7a68 100644
--- a/packages/openmoko-projects/exposure_svn.bb
+++ b/packages/openmoko-projects/exposure_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Exposure all devices on neo1973"
 DEPENDS = "python-etk python-dbus"
 RDEPENDS = "python-etk python-re python-codecs python-dbus"
 PV = "0.0.1+svnr${SRCREV}"
-PR = "r2.01"
+PR = "r2.02"
 
 S = "${WORKDIR}/trunk"
 
@@ -11,5 +11,4 @@ SRC_URI = "svn://svn.projects.openmoko.org/svnroot/exposure;module=trunk;proto=h
 
 
 PACKAGES = "${PN}"
-
-FILES_${PN} += "${prefix}/share/*"
+FILES_${PN} += "${prefix}/share/* ${sysconfdir}/X11/Xsession.d/*"
-- 
cgit v1.2.3


From 7892426bc27ad46c8a1a779ec581a493aa32554f Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@openmoko.org>
Date: Wed, 2 Jul 2008 13:26:30 +0200
Subject: srcrev/exposure: Upgrade exposure to have the xdg changes

---
 packages/openmoko-projects/exposure_svn.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages')

diff --git a/packages/openmoko-projects/exposure_svn.bb b/packages/openmoko-projects/exposure_svn.bb
index 14093a7a68..4434f0bee5 100644
--- a/packages/openmoko-projects/exposure_svn.bb
+++ b/packages/openmoko-projects/exposure_svn.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Exposure all devices on neo1973"
-DEPENDS = "python-etk python-dbus"
-RDEPENDS = "python-etk python-re python-codecs python-dbus"
+DEPENDS = "python-etk python-edbus"
+RDEPENDS = "python-etk python-re python-codecs python-edbus python-pyxdg"
 PV = "0.0.1+svnr${SRCREV}"
-PR = "r2.02"
+PR = "r2.03"
 
 S = "${WORKDIR}/trunk"
 
-- 
cgit v1.2.3


From 935c3e5f12b681a6a075df3034b241d04bd91484 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@openmoko.org>
Date: Sun, 3 Aug 2008 23:49:17 +0200
Subject: exposure: Add patch to make r62 build The Icon of exposure was
 removed from the trunk but is still referenced from the setup.py file. In the
 best case the exposure icon would be restored as we currently lack an icon.
 As we want to build r62 now for testing it is best to cope with the missing
 icon...

---
 packages/openmoko-projects/exposure/setup-r62.diff | 12 ++++++++++++
 packages/openmoko-projects/exposure_svn.bb         |  5 +++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 packages/openmoko-projects/exposure/setup-r62.diff

(limited to 'packages')

diff --git a/packages/openmoko-projects/exposure/setup-r62.diff b/packages/openmoko-projects/exposure/setup-r62.diff
new file mode 100644
index 0000000000..694787bdec
--- /dev/null
+++ b/packages/openmoko-projects/exposure/setup-r62.diff
@@ -0,0 +1,12 @@
+Index: setup.py
+===================================================================
+--- setup.py	(Revision 62)
++++ setup.py	(Arbeitskopie)
+@@ -27,7 +27,6 @@
+     setup_requires=['python-evas>=0.2.1'],
+     data_files=[('applications', 'src/exposure.desktop']),
+ 	('exposure', ['data/themes/exposure.edj']),
+-	('images', ['data/image/exposure.jpg']),
+ 	('/etc/X11/Xsession.d/', ['src/80app-launcher-bootup']),
+         ]
+ )
diff --git a/packages/openmoko-projects/exposure_svn.bb b/packages/openmoko-projects/exposure_svn.bb
index 4434f0bee5..03227798e6 100644
--- a/packages/openmoko-projects/exposure_svn.bb
+++ b/packages/openmoko-projects/exposure_svn.bb
@@ -2,12 +2,13 @@ DESCRIPTION = "Exposure all devices on neo1973"
 DEPENDS = "python-etk python-edbus"
 RDEPENDS = "python-etk python-re python-codecs python-edbus python-pyxdg"
 PV = "0.0.1+svnr${SRCREV}"
-PR = "r2.03"
+PR = "r2.04"
 
 S = "${WORKDIR}/trunk"
 
 inherit setuptools
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/exposure;module=trunk;proto=http"
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/exposure;module=trunk;proto=http \
+           file://setup-r62.diff;patch=1;pnum=0"
 
 
 PACKAGES = "${PN}"
-- 
cgit v1.2.3


From 2b05af10a63e7a66a0ae826a48ae9fba4eb9819d Mon Sep 17 00:00:00 2001
From: Julian_chu <julian_chu@openmoko.com>
Date: Mon, 4 Aug 2008 17:14:59 +0800
Subject: exposure: Bump up the reversion of exposure to 63

Exposure had correct the setup.py in r63.
Bump up the reversion and remove patch
---
 packages/openmoko-projects/exposure_svn.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/openmoko-projects/exposure_svn.bb b/packages/openmoko-projects/exposure_svn.bb
index 03227798e6..dd36335608 100644
--- a/packages/openmoko-projects/exposure_svn.bb
+++ b/packages/openmoko-projects/exposure_svn.bb
@@ -2,13 +2,13 @@ DESCRIPTION = "Exposure all devices on neo1973"
 DEPENDS = "python-etk python-edbus"
 RDEPENDS = "python-etk python-re python-codecs python-edbus python-pyxdg"
 PV = "0.0.1+svnr${SRCREV}"
-PR = "r2.04"
+PR = "r2.05"
 
 S = "${WORKDIR}/trunk"
 
 inherit setuptools
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/exposure;module=trunk;proto=http \
-           file://setup-r62.diff;patch=1;pnum=0"
+           "
 
 
 PACKAGES = "${PN}"
-- 
cgit v1.2.3


From 26fd1d39f416165bde0bd943f49e3af9b1d35b0b Mon Sep 17 00:00:00 2001
From: Julian_chu <julian_chu@openmoko.com>
Date: Tue, 5 Aug 2008 17:31:04 +0800
Subject: openmoko: Rename from exposure to om-settings

---
 packages/openmoko-projects/exposure_svn.bb    | 15 ---------------
 packages/openmoko-projects/om-settings_svn.bb | 15 +++++++++++++++
 packages/tasks/task-openmoko-asu.bb           |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 packages/openmoko-projects/exposure_svn.bb
 create mode 100644 packages/openmoko-projects/om-settings_svn.bb

(limited to 'packages')

diff --git a/packages/openmoko-projects/exposure_svn.bb b/packages/openmoko-projects/exposure_svn.bb
deleted file mode 100644
index dd36335608..0000000000
--- a/packages/openmoko-projects/exposure_svn.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Exposure all devices on neo1973"
-DEPENDS = "python-etk python-edbus"
-RDEPENDS = "python-etk python-re python-codecs python-edbus python-pyxdg"
-PV = "0.0.1+svnr${SRCREV}"
-PR = "r2.05"
-
-S = "${WORKDIR}/trunk"
-
-inherit setuptools
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/exposure;module=trunk;proto=http \
-           "
-
-
-PACKAGES = "${PN}"
-FILES_${PN} += "${prefix}/share/* ${sysconfdir}/X11/Xsession.d/*"
diff --git a/packages/openmoko-projects/om-settings_svn.bb b/packages/openmoko-projects/om-settings_svn.bb
new file mode 100644
index 0000000000..dd36335608
--- /dev/null
+++ b/packages/openmoko-projects/om-settings_svn.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Exposure all devices on neo1973"
+DEPENDS = "python-etk python-edbus"
+RDEPENDS = "python-etk python-re python-codecs python-edbus python-pyxdg"
+PV = "0.0.1+svnr${SRCREV}"
+PR = "r2.05"
+
+S = "${WORKDIR}/trunk"
+
+inherit setuptools
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/exposure;module=trunk;proto=http \
+           "
+
+
+PACKAGES = "${PN}"
+FILES_${PN} += "${prefix}/share/* ${sysconfdir}/X11/Xsession.d/*"
diff --git a/packages/tasks/task-openmoko-asu.bb b/packages/tasks/task-openmoko-asu.bb
index af17e456d8..97273022cb 100644
--- a/packages/tasks/task-openmoko-asu.bb
+++ b/packages/tasks/task-openmoko-asu.bb
@@ -4,7 +4,7 @@ SECTION = "openmoko/base"
 ALLOW_EMPTY = "1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 LICENSE = "MIT"
-PR = "r2"
+PR = "r2.02"
 
 inherit task
 
@@ -31,7 +31,7 @@ RDEPENDS_task-openmoko-asu = "\
   xset \
   xrandr \
   libnotify \
-  exposure \
+  om-settings \
   etk-theme-ninja \
   openmoko-community-repository \
   assassin-thumbnail \
-- 
cgit v1.2.3


From 887fd1dd549c3686592ad19d524a0b9e020164d8 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <graeme@openmoko.org>
Date: Wed, 27 Aug 2008 13:37:10 +0100
Subject: om-settings: fix versions

---
 packages/openmoko-projects/om-settings_svn.bb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages')

diff --git a/packages/openmoko-projects/om-settings_svn.bb b/packages/openmoko-projects/om-settings_svn.bb
index dd36335608..56b8e1d017 100644
--- a/packages/openmoko-projects/om-settings_svn.bb
+++ b/packages/openmoko-projects/om-settings_svn.bb
@@ -3,6 +3,7 @@ DEPENDS = "python-etk python-edbus"
 RDEPENDS = "python-etk python-re python-codecs python-edbus python-pyxdg"
 PV = "0.0.1+svnr${SRCREV}"
 PR = "r2.05"
+PE = "1"
 
 S = "${WORKDIR}/trunk"
 
-- 
cgit v1.2.3


From de0310cd0da2b6c54181c94186cca5c7d0600bb6 Mon Sep 17 00:00:00 2001
From: Julian_chu <julian_chu@openmoko.com>
Date: Sun, 3 Aug 2008 22:28:55 +0800
Subject: 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
---
 .../diversity-maps-taipei_20080430.bb              |  7 -------
 packages/openmoko-projects/diversity-maps.inc      | 18 ------------------
 .../openmoko-projects/om-maps-berlin_20080430.bb   |  7 +++++++
 .../om-maps-buenos-aires_20080430.bb               |  7 +++++++
 .../openmoko-projects/om-maps-london_20080430.bb   |  7 +++++++
 .../openmoko-projects/om-maps-new-york_20080430.bb |  7 +++++++
 .../openmoko-projects/om-maps-paris_20080430.bb    |  7 +++++++
 .../om-maps-providence_20080430.bb                 |  7 +++++++
 .../om-maps-san-francisco_20080430.bb              |  7 +++++++
 .../openmoko-projects/om-maps-sydney_20080430.bb   |  7 +++++++
 .../openmoko-projects/om-maps-taipei_20080430.bb   |  7 +++++++
 packages/openmoko-projects/om-maps.inc             | 18 ++++++++++++++++++
 packages/tasks/task-openmoko-feed.bb               | 22 +++++++++++-----------
 13 files changed, 92 insertions(+), 36 deletions(-)
 delete mode 100644 packages/openmoko-projects/diversity-maps-taipei_20080430.bb
 delete mode 100644 packages/openmoko-projects/diversity-maps.inc
 create mode 100644 packages/openmoko-projects/om-maps-berlin_20080430.bb
 create mode 100644 packages/openmoko-projects/om-maps-buenos-aires_20080430.bb
 create mode 100644 packages/openmoko-projects/om-maps-london_20080430.bb
 create mode 100644 packages/openmoko-projects/om-maps-new-york_20080430.bb
 create mode 100644 packages/openmoko-projects/om-maps-paris_20080430.bb
 create mode 100644 packages/openmoko-projects/om-maps-providence_20080430.bb
 create mode 100644 packages/openmoko-projects/om-maps-san-francisco_20080430.bb
 create mode 100644 packages/openmoko-projects/om-maps-sydney_20080430.bb
 create mode 100644 packages/openmoko-projects/om-maps-taipei_20080430.bb
 create mode 100644 packages/openmoko-projects/om-maps.inc

(limited to 'packages')

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/diversity-maps.inc b/packages/openmoko-projects/diversity-maps.inc
deleted file mode 100644
index 9af5e95d95..0000000000
--- a/packages/openmoko-projects/diversity-maps.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-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}
-}
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/om-maps.inc b/packages/openmoko-projects/om-maps.inc
new file mode 100644
index 0000000000..a714670930
--- /dev/null
+++ b/packages/openmoko-projects/om-maps.inc
@@ -0,0 +1,18 @@
+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/om-maps/${MAP_VER}/${MAP_FN}"
+
+MAP_DIR = "${datadir}/om-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}
+}
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 \
-- 
cgit v1.2.3


From e8b744d0bc9495f698fcf6c222a864eab7f451db Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@openmoko.com>
Date: Mon, 22 Sep 2008 15:04:17 +0800
Subject: maps: Add map of Hong Kong.

---
 packages/openmoko-projects/om-maps-hong-kong_20080919.bb | 7 +++++++
 packages/tasks/task-openmoko-feed.bb                     | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 packages/openmoko-projects/om-maps-hong-kong_20080919.bb

(limited to 'packages')

diff --git a/packages/openmoko-projects/om-maps-hong-kong_20080919.bb b/packages/openmoko-projects/om-maps-hong-kong_20080919.bb
new file mode 100644
index 0000000000..cedf5290fc
--- /dev/null
+++ b/packages/openmoko-projects/om-maps-hong-kong_20080919.bb
@@ -0,0 +1,7 @@
+PR = "r0"
+
+require om-maps.inc
+
+MAP_NAME = "Hong Kong"
+MAP_FN = "om-maps-hong-kong-${PV}.eet"
+MAP_VER = "${PV}"
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 21c9cbf9ed..2a1a46f30d 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 = "r44"
+PR = "r45"
 
 inherit task
 
@@ -51,6 +51,7 @@ RDEPENDS_task-openmoko-feed = "\
 #  diversity-maps-taipei \
   om-maps-berlin \
   om-maps-buenos-aires \
+  om-maps-hong-kong \
   om-maps-london \
   om-maps-new-york \
   om-maps-paris \
-- 
cgit v1.2.3


From b8f9eaade7d3667114805954a5982fec801f2193 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@openmoko.com>
Date: Tue, 30 Sep 2008 23:47:59 +0800
Subject: om-locations: Attribute to OpenStreetMap.

---
 packages/openmoko-projects/om-maps-berlin_20080430.bb        | 2 +-
 packages/openmoko-projects/om-maps-buenos-aires_20080430.bb  | 2 +-
 packages/openmoko-projects/om-maps-hong-kong_20080919.bb     | 2 +-
 packages/openmoko-projects/om-maps-london_20080430.bb        | 2 +-
 packages/openmoko-projects/om-maps-new-york_20080430.bb      | 2 +-
 packages/openmoko-projects/om-maps-paris_20080430.bb         | 2 +-
 packages/openmoko-projects/om-maps-providence_20080430.bb    | 2 +-
 packages/openmoko-projects/om-maps-san-francisco_20080430.bb | 2 +-
 packages/openmoko-projects/om-maps-sydney_20080430.bb        | 2 +-
 packages/openmoko-projects/om-maps-taipei_20080430.bb        | 2 +-
 packages/openmoko-projects/om-maps.inc                       | 5 +++--
 11 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'packages')

diff --git a/packages/openmoko-projects/om-maps-berlin_20080430.bb b/packages/openmoko-projects/om-maps-berlin_20080430.bb
index 01120d1ce7..aaf6e5332c 100644
--- a/packages/openmoko-projects/om-maps-berlin_20080430.bb
+++ b/packages/openmoko-projects/om-maps-berlin_20080430.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 
 require om-maps.inc
 
diff --git a/packages/openmoko-projects/om-maps-buenos-aires_20080430.bb b/packages/openmoko-projects/om-maps-buenos-aires_20080430.bb
index ed1cc60bb7..81f734f27a 100644
--- a/packages/openmoko-projects/om-maps-buenos-aires_20080430.bb
+++ b/packages/openmoko-projects/om-maps-buenos-aires_20080430.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 
 require om-maps.inc
 
diff --git a/packages/openmoko-projects/om-maps-hong-kong_20080919.bb b/packages/openmoko-projects/om-maps-hong-kong_20080919.bb
index cedf5290fc..9aecf64816 100644
--- a/packages/openmoko-projects/om-maps-hong-kong_20080919.bb
+++ b/packages/openmoko-projects/om-maps-hong-kong_20080919.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 
 require om-maps.inc
 
diff --git a/packages/openmoko-projects/om-maps-london_20080430.bb b/packages/openmoko-projects/om-maps-london_20080430.bb
index 343c569414..d07add5032 100644
--- a/packages/openmoko-projects/om-maps-london_20080430.bb
+++ b/packages/openmoko-projects/om-maps-london_20080430.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 
 require om-maps.inc
 
diff --git a/packages/openmoko-projects/om-maps-new-york_20080430.bb b/packages/openmoko-projects/om-maps-new-york_20080430.bb
index da00649954..2fffda62c3 100644
--- a/packages/openmoko-projects/om-maps-new-york_20080430.bb
+++ b/packages/openmoko-projects/om-maps-new-york_20080430.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 
 require om-maps.inc
 
diff --git a/packages/openmoko-projects/om-maps-paris_20080430.bb b/packages/openmoko-projects/om-maps-paris_20080430.bb
index 2b1cfa4b8e..663656a673 100644
--- a/packages/openmoko-projects/om-maps-paris_20080430.bb
+++ b/packages/openmoko-projects/om-maps-paris_20080430.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 
 require om-maps.inc
 
diff --git a/packages/openmoko-projects/om-maps-providence_20080430.bb b/packages/openmoko-projects/om-maps-providence_20080430.bb
index 361107755c..919e030e17 100644
--- a/packages/openmoko-projects/om-maps-providence_20080430.bb
+++ b/packages/openmoko-projects/om-maps-providence_20080430.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 
 require om-maps.inc
 
diff --git a/packages/openmoko-projects/om-maps-san-francisco_20080430.bb b/packages/openmoko-projects/om-maps-san-francisco_20080430.bb
index 9aa2da00d9..6b5f77981a 100644
--- a/packages/openmoko-projects/om-maps-san-francisco_20080430.bb
+++ b/packages/openmoko-projects/om-maps-san-francisco_20080430.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 
 require om-maps.inc
 
diff --git a/packages/openmoko-projects/om-maps-sydney_20080430.bb b/packages/openmoko-projects/om-maps-sydney_20080430.bb
index 0f892ca429..267b6a1724 100644
--- a/packages/openmoko-projects/om-maps-sydney_20080430.bb
+++ b/packages/openmoko-projects/om-maps-sydney_20080430.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 
 require om-maps.inc
 
diff --git a/packages/openmoko-projects/om-maps-taipei_20080430.bb b/packages/openmoko-projects/om-maps-taipei_20080430.bb
index 3ff7cf32b1..bb017f59fb 100644
--- a/packages/openmoko-projects/om-maps-taipei_20080430.bb
+++ b/packages/openmoko-projects/om-maps-taipei_20080430.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 
 require om-maps.inc
 
diff --git a/packages/openmoko-projects/om-maps.inc b/packages/openmoko-projects/om-maps.inc
index a714670930..f2ef1dbbec 100644
--- a/packages/openmoko-projects/om-maps.inc
+++ b/packages/openmoko-projects/om-maps.inc
@@ -1,5 +1,6 @@
-DESCRIPTION = "Map of ${MAP_NAME}, for use with Locations application"
-HOMEPAGE = "http://diversity.projects.openmoko.org/"
+DESCRIPTION = "Map of ${MAP_NAME}, for use with Locations application. \
+               Data from OpenStreetMap.org, licenced CC-by-SA."
+HOMEPAGE = "http://wiki.openmoko.org/wiki/Om_2008.8_Locations"
 SECTION = "network/misc"
 LICENSE = "Creative Commons Attribution-ShareAlike 2.0"
 
-- 
cgit v1.2.3


From 18157632c76d794f164222f59ac992c8e1213d4c Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@openmoko.com>
Date: Tue, 30 Sep 2008 23:50:09 +0800
Subject: om-locations: Add map of low levels.

---
 packages/openmoko-projects/om-maps-low-levels_20080430.bb | 7 +++++++
 packages/tasks/task-openmoko-asu.bb                       | 1 +
 packages/tasks/task-openmoko-feed.bb                      | 1 +
 3 files changed, 9 insertions(+)
 create mode 100644 packages/openmoko-projects/om-maps-low-levels_20080430.bb

(limited to 'packages')

diff --git a/packages/openmoko-projects/om-maps-low-levels_20080430.bb b/packages/openmoko-projects/om-maps-low-levels_20080430.bb
new file mode 100644
index 0000000000..7f94c903b5
--- /dev/null
+++ b/packages/openmoko-projects/om-maps-low-levels_20080430.bb
@@ -0,0 +1,7 @@
+PR = "r0"
+
+require om-maps.inc
+
+MAP_NAME = "low levels"
+MAP_FN = "om-maps-low-levels-${PV}.eet"
+MAP_VER = "${PV}"
diff --git a/packages/tasks/task-openmoko-asu.bb b/packages/tasks/task-openmoko-asu.bb
index 97273022cb..0cdb6aee7b 100644
--- a/packages/tasks/task-openmoko-asu.bb
+++ b/packages/tasks/task-openmoko-asu.bb
@@ -23,6 +23,7 @@ RDEPENDS_task-openmoko-asu = "\
   assassin \
   diversity-daemon \
   om-locations \
+  om-maps-low-levels \
   ${XSERVER} \
   xserver-kdrive-common \
   xserver-nodm-init \
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 2a1a46f30d..921f4d7edd 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -53,6 +53,7 @@ RDEPENDS_task-openmoko-feed = "\
   om-maps-buenos-aires \
   om-maps-hong-kong \
   om-maps-london \
+  om-maps-low-levels \
   om-maps-new-york \
   om-maps-paris \
   om-maps-providence \
-- 
cgit v1.2.3