openmoko2:

* prepare for SVNREV
* add openmoko-calculator2

diff --git a/classes/openmoko2.bbclass b/classes/openmoko2.bbclass
index 4675b6a10ee56571bb3a4399fca5fdc702111361..bf5e1da6b8c2457eb07ce440e3bf260e8e42773b 100644 (file)
--- a/classes/openmoko2.bbclass
+++ b/classes/openmoko2.bbclass
@@ -26,3 +26,6 @@ SRC_URI := "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=$
 S = "${WORKDIR}/${PN}"
 
 FILES_${PN} += "${datadir}/icons"
+
+# until we have SRCREV computing
+SRCREV ?= "0${SRCDATE}"

diff --git a/packages/openmoko2/libmokogsmd2_svn.bb b/packages/openmoko2/libmokogsmd2_svn.bb
index 8fe54f3348a5f4221b2c1c6958d0d71f991d9e0f..8e547b366358305016f581a86dc10251d5f34b75 100644 (file)
--- a/packages/openmoko2/libmokogsmd2_svn.bb
+++ b/packages/openmoko2/libmokogsmd2_svn.bb
@@ -1,6 +1,6 @@
 SECTION = "openmoko/libs"
 DEPENDS = "libgsmd glib-2.0"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r1"
 
 inherit openmoko2

diff --git a/packages/openmoko2/libmokojournal2_svn.bb b/packages/openmoko2/libmokojournal2_svn.bb
index e5a1fe74f85e71af703f1b9b360dffea576cec32..90f93074acd23829b3c21ed41f16f941e41a3779 100644 (file)
--- a/packages/openmoko2/libmokojournal2_svn.bb
+++ b/packages/openmoko2/libmokojournal2_svn.bb
@@ -1,6 +1,6 @@
 SECTION = "openmoko/libs"
 DEPENDS = "eds-dbus"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r1"
 
 inherit openmoko2

diff --git a/packages/openmoko2/libmokopanelui2_svn.bb b/packages/openmoko2/libmokopanelui2_svn.bb
index c76729e619d6caf1ae47cc3a2057cc40143dc1fa..54fe73c6bda2cfa060603191f2a237ea2b22331a 100644 (file)
--- a/packages/openmoko2/libmokopanelui2_svn.bb
+++ b/packages/openmoko2/libmokopanelui2_svn.bb
@@ -1,6 +1,6 @@
 SECTION = "openmoko/libs"
 DEPENDS = "gtk+"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r1" 
 
 inherit openmoko2

diff --git a/packages/openmoko2/libmokoui2_svn.bb b/packages/openmoko2/libmokoui2_svn.bb
index f818578c219055bdad6af28f03eebf23c110f162..6042f67e0a3af494cccd6dbd13a3e497c9af4659 100644 (file)
--- a/packages/openmoko2/libmokoui2_svn.bb
+++ b/packages/openmoko2/libmokoui2_svn.bb
@@ -1,6 +1,6 @@
 SECTION = "openmoko/libs"
 DEPENDS = "gtk+"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r1"
 
 inherit openmoko2

diff --git a/packages/openmoko2/openmoko-calculator2_svn.bb b/packages/openmoko2/openmoko-calculator2_svn.bb
new file mode 100644 (file)
index 0000000..8e0c9ad
--- /dev/null
+++ b/packages/openmoko2/openmoko-calculator2_svn.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "A Calculator for OpenMoko"
+SECTION = "openmoko/tools"
+DEPENDS = "libmokoui2"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r0"
+
+inherit openmoko2

diff --git a/packages/openmoko2/openmoko-contacts2_svn.bb b/packages/openmoko2/openmoko-contacts2_svn.bb
index e44f387fc7578ad917aa0cc6f480f9a82bc1b49f..72bbc8517cf18668ecfdd438119e2ffbaaa9acb4 100644 (file)
--- a/packages/openmoko2/openmoko-contacts2_svn.bb
+++ b/packages/openmoko2/openmoko-contacts2_svn.bb
@@ -1,12 +1,12 @@
 DESCRIPTION = "The OpenMoko address book"
 SECTION = "openmoko/pim"
 RDEPENDS = "libedata-book"
-PV = "0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r2"
 
 inherit openmoko2
 
-SRC_URI = "svn://svn.o-hand.com/repos/contacts/branches/;module=hito;proto=http"
+SRC_URI = "svn://svn.o-hand.com/repos/contacts/branches;module=hito;proto=http"
 S = "${WORKDIR}/hito/"
 
 EXTRA_OECONF = "--disable-gnome-vfs --with-frontend=openmoko"

diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb
index ccbd6f8775c8ccc292a01c966a38b40af1e8ddf2..08ef166ee17669c4ea619dfefe3f99dba95653a6 100644 (file)
--- a/packages/openmoko2/openmoko-dialer2_svn.bb
+++ b/packages/openmoko2/openmoko-dialer2_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "The OpenMoko Dialer"
 SECTION = "openmoko/pim"
 DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r1"
 
 inherit openmoko2

diff --git a/packages/openmoko2/openmoko-feedreader2_svn.bb b/packages/openmoko2/openmoko-feedreader2_svn.bb
index 41f28ed6a1f5fca75d55c860c729cc40e8425bc1..eed51d1cd66fb4fd6a2305437c9bf82c30181804 100644 (file)
--- a/packages/openmoko2/openmoko-feedreader2_svn.bb
+++ b/packages/openmoko2/openmoko-feedreader2_svn.bb
@@ -1,9 +1,7 @@
-DESCRIPTION = "The OpenMoko RSS Reader"
-SECTION = "openmoko/applications"
+DESCRIPTION = "The OpenMoko Feed Reader"
+SECTION = "openmoko/apps"
 DEPENDS += "libmrss check webkit"
-
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.0.1+svnr${SRCREV}"
 PR = "r0"
 
 inherit openmoko2
-

diff --git a/packages/openmoko2/openmoko-icon-theme-standard_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard_svn.bb
index 8029e1fbc9f0c1a862ee49aabc40b443dbaf733d..dc88d14ba5cd4626dceef8530b9472b767948db3 100644 (file)
--- a/packages/openmoko2/openmoko-icon-theme-standard_svn.bb
+++ b/packages/openmoko2/openmoko-icon-theme-standard_svn.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution"
 SECTION = "openmoko/base"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svn${SRCREV}"
 PR = "r1"
 
 inherit openmoko-base autotools

diff --git a/packages/openmoko2/openmoko-theme-standard2_svn.bb b/packages/openmoko2/openmoko-theme-standard2_svn.bb
index ed707a9617c5a8257375e1b3b6f7e242de9ee4c3..a5f31080933bd573c98e0ec914b76ae5709575e5 100644 (file)
--- a/packages/openmoko2/openmoko-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-theme-standard2_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
 SECTION = "openmoko/base"
 RCONFLICTS = "openmoko-theme-standard"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCDATE}"
 PR = "r1"
 
 inherit openmoko2

diff --git a/packages/openmoko2/openmoko-today2_svn.bb b/packages/openmoko2/openmoko-today2_svn.bb
index a38be614f47cb73ce5e37682da5b68fb72947cd4..94ea147b8780877b21e315f4c2fa7a13ba6d1586 100644 (file)
--- a/packages/openmoko2/openmoko-today2_svn.bb
+++ b/packages/openmoko2/openmoko-today2_svn.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "The OpenMoko Application Launcher"
 SECTION = "openmoko/pim"
 DEPENDS = "libmokoui2 startup-notification dbus-glib libice libsm"
-
-PV = "0.1.0+srvn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 
 inherit openmoko2 gtk-icon-cache