diversity: update to SRC_URI in projects.openmoko.org

* update sane-srcrevs.inc and moko-autorev.inc accordingly

diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index aa2d39f3db75148569cd2102609378eda6ed8b24..56b89ac98352a1de811b976cc68254bb40856aea 100644 (file)
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -7,6 +7,8 @@ SRCREV_pn-libmokoui2 ?= "${AUTOREV}"
 SRCREV_pn-linux-openmoko ?= "${AUTOREV}"
 SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
 
+SRCREV_pn-diversity-daemon ?= "${AUTOREV}"
+SRCREV_pn-diversity-nav ?= "${AUTOREV}"
 SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
 SRCREV_pn-neod ?= "${AUTOREV}"
 SRCREV_pn-opkg ?= "${AUTOREV}"

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index b0c41bedbf53955b183ccfb98458d4b999ffb86a..e4e4e95360de7ce84675df2246a7f9d90eaa0ea4 100644 (file)
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -18,6 +18,8 @@ SRCREV_pn-dbus-c++-native ?= "13131"
 SRCREV_pn-dbus-c++ ?= "13131"
 SRCREV_pn-dfu-util ?= "2866"
 SRCREV_pn-dfu-util-native ?= "2866"
+SRCREV_pn-diversity-daemon ?= "127"
+SRCREV_pn-diversity-nav ?= "238"
 SRCREV_pn-eds-dbus ?= "659"
 SRCREV_pn-eglibc ?= "4355"
 SRCREV_pn-eglibc-initial ?= "4355"

diff --git a/packages/diversity/diversity-daemon_svn.bb b/packages/diversity/diversity-daemon_svn.bb
index bcce953cc575cc66482404a2a0b4dd074dc333ff..6ea4f54a9284e0e64aea86da63a58d3cb5ea1712 100644 (file)
--- a/packages/diversity/diversity-daemon_svn.bb
+++ b/packages/diversity/diversity-daemon_svn.bb
@@ -1,19 +1,19 @@
 DESCRIPTION = "Diveristy Daemon"
+HOMEPAGE = "http://diversity.projects.openmoko.org/"
 SECTION = "net/misc"
 LICENSE = "GPL"
-HOMEPAGE = "http://www.openmoko.org/"
 DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus gypsy libjana curl"
 RDEPENDS = "eds-dbus gypsy openmoko-dialer2"
-SRCREV = "${AUTOREV}"
 PV = "0.0+svnr${SRCREV}"
-
 PR = "r1"
 
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https"
+
+S = "${WORKDIR}/diversity-daemon"
+
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-nm --disable-geoclue --disable-xmpp --enable-session-bus"
-SRC_URI = "svn://svn.internal.openmoko.org/trunk/diversity;module=backends;proto=https"
 
-S = "${WORKDIR}/backends"
 FILES_${PN} += "${datadir}/dbus-1/"
 FILES_${PN} += "${sysconfdir}/dbus-1/"

diff --git a/packages/diversity/diversity-nav_svn.bb b/packages/diversity/diversity-nav_svn.bb
index 750a636af3a978a51a877bdb61157c986ef11624..58090e9baf6378572733edc62e1c6824da601183 100644 (file)
--- a/packages/diversity/diversity-nav_svn.bb
+++ b/packages/diversity/diversity-nav_svn.bb
@@ -1,16 +1,16 @@
 DESCRIPTION = "Diversity_nav - a GPS location based communicative application"
+HOMEPAGE = "http://diversity.projects.openmoko.org/"
+SECTION = "openmoko/applications"
 LICENSE = "GPL"
 DEPENDS = "evas edje ecore edbus"
 RDEPENDS = "libevas-engine-buffer libevas-engine-software-16 libevas-engine-software-16-x11 libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-eet libevas-loader-jpeg libevas-loader-png"
-SECTION = "openmoko/applications"
-
-SRCREV = "${AUTOREV}"
 PV = "0.0.1+svnr${SRCREV}"
 PR = "r1"
 
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
-SRC_URI = "svn://svn.internal.openmoko.org/trunk/diversity/ui/modules;module=diversity_nav;proto=https"
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-nav;proto=https"
 
-S = "${WORKDIR}/diversity_nav"
+S = "${WORKDIR}/diversity-nav"
 
 inherit autotools pkgconfig
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"