summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2007-11-22 16:51:57 +0000
committerGraeme Gregory <dp@xora.org.uk>2007-11-22 16:51:57 +0000
commitf52ae4fc6ebe1ff77bf1749f71da604650b374bb (patch)
treede056f8523722f8896b30a8ac04b7012a5a36f4b
parent1ffe4a97e188cf21fe157f5a7e7841f8a2421e75 (diff)
parent425a27eae1ea6551c932f5a43715c189d031f189 (diff)
merge of '40f293b10b110d85c793d96acc26403ea53edb48'
and '8e1c07ccc20b627b1a8808a0a3b8a7afcaf72b79'
-rw-r--r--conf/distro/include/moko-autorev.inc1
-rw-r--r--conf/distro/include/sane-srcrevs.inc4
-rw-r--r--packages/tasks/task-openmoko.bb4
3 files changed, 5 insertions, 4 deletions
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index aeb0a2afbc..0e29c19c5c 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -35,6 +35,7 @@ SRCREV_pn-openmoko-keyboard ?= "${AUTOREV}"
SRCREV_pn-openmoko-libs ?= "${AUTOREV}"
SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-messages ?= "${AUTOREV}"
+SRCREV_pn-openmoko-messages2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}"
SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}"
SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 7187c875be..ead766e3ee 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -81,7 +81,7 @@ SRCREV_pn-openmoko-keyboard ?= "1631"
SRCREV_pn-openmoko-libs ?= "2367"
SRCREV_pn-openmoko-mediaplayer2 ?= "3345"
SRCREV_pn-openmoko-messages ?= "2276"
-SRCREV_pn-openmoko-messages2 ?= "3424"
+SRCREV_pn-openmoko-messages2 ?= "3477"
SRCREV_pn-openmoko-panel-battery ?= "3360"
SRCREV_pn-openmoko-panel-bt ?= "3149"
SRCREV_pn-openmoko-panel-clock ?= "2567"
@@ -105,7 +105,7 @@ SRCREV_pn-openmoko-theme-standard-qvga ?= "2370"
SRCREV_pn-openmoko-theme-standard2 ?= "3425"
SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425"
SRCREV_pn-openmoko-today ?= "3056"
-SRCREV_pn-openmoko-today2 ?= "3342"
+SRCREV_pn-openmoko-today2 ?= "3478"
SRCREV_pn-openmoko-today2-folders ?= "3414"
SRCREV_pn-openmoko-worldclock2 ?= "3365"
SRCREV_pn-openocd ?= "206"
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index f03e822db8..e7b00e3316 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
SECTION = "openmoko/base"
LICENSE = "MIT"
PROVIDES = "task-openmoko-everything"
-PR = "r69"
+PR = "r70"
inherit task
@@ -139,7 +139,7 @@ RDEPENDS_task-openmoko-pim = "\
openmoko-appmanager2 \
openmoko-tasks2 \
openmoko-mediaplayer2 \
-# openmoko-messages \
+ openmoko-messages2 \
"
#