summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorStelios Koroneos <skoroneos@digital-opsis.com>2007-10-23 09:41:03 +0000
committerStelios Koroneos <skoroneos@digital-opsis.com>2007-10-23 09:41:03 +0000
commite22c3e0be22865b859db82392977e9bab4b969ac (patch)
treebb9c6e4f3efaec409f0762ef460126327bad6b1b /conf
parent85ca40bd98d458989c41c3bd6d4b2b13981a5fd0 (diff)
parentf2166278762bb9696ce24d659c81ffc2c77153f2 (diff)
merge of '070533cbb8f39d9306bbc120371891e171775516'
and 'f695654d2676f4d969fd509c4b4e96172463fbe2'
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/angstrom-2007-preferred-versions.inc3
-rw-r--r--conf/distro/include/moko-autorev.inc3
-rw-r--r--conf/distro/include/sane-srcrevs.inc4
3 files changed, 6 insertions, 4 deletions
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index 0695c8cc3a..61560e3c44 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -668,7 +668,6 @@ PREFERRED_VERSION_hildon-libs ?= "0.15.1"
PREFERRED_VERSION_hildon-navigator ?= "0.9.6-2"
PREFERRED_VERSION_hildon-status-bar ?= "0.8.11-1"
PREFERRED_VERSION_hildon-thumbnail ?= "0.11"
-PREFERRED_VERSION_hnb ?= "1.9.17"
PREFERRED_VERSION_hostap-conf ?= "1.0"
PREFERRED_VERSION_hostap-daemon ?= "0.4.4"
PREFERRED_VERSION_hostap-modules ?= "0.4.7"
@@ -1232,7 +1231,7 @@ PREFERRED_VERSION_miau ?= "0.5.3"
PREFERRED_VERSION_micro-emacs ?= "20060909"
PREFERRED_VERSION_microcom ?= "1.02"
PREFERRED_VERSION_microwindows ?= "0.90"
-PREFERRED_VERSION_midori ?= "0.0.8"
+PREFERRED_VERSION_midori ?= "0.0.10"
PREFERRED_VERSION_midpath ?= "0.1"
PREFERRED_VERSION_midpath-alsa ?= "0.1"
PREFERRED_VERSION_midpath-cldc ?= "0.1"
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 6695dd0d97..d557c77e9a 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -7,9 +7,12 @@ SRCREV_pn-linux-openmoko ?= "${AUTOREV}"
SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
+SRCREV_pn-neod ?= "${AUTOREV}"
SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
+SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
+SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-calculator ?= "${AUTOREV}"
SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-common ?= "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 1ff21f0b11..6ba1aa65e5 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -49,7 +49,7 @@ SRCREV_pn-osb-nrcore ?= "126"
SRCREV_pn-openmoko-appearance ?= "3239"
SRCREV_pn-openmoko-appmanager ?= "1851"
SRCREV_pn-openmoko-appmanager2 ?= "3090"
-SRCREV_pn-openmoko-browser2 ?= "3082"
+SRCREV_pn-openmoko-browser2 ?= "3249"
SRCREV_pn-openmoko-calculator ?= "2404"
SRCREV_pn-openmoko-calculator2 ?= "3235"
SRCREV_pn-openmoko-common ?= "397"
@@ -103,7 +103,7 @@ SRCREV_pn-psplash ?= "249"
SRCREV_pn-settings-daemon ?= "1755"
SRCREV_pn-sjf2410-linux-native ?= "933"
SRCREV_pn-sphyrna ?= "45"
-SRCREV_pn-webkit-gtk ?= "26079"
+SRCREV_pn-webkit-gtk ?= "26915"
SRCREV_pn-webkit-qt ?= "26079"
SRCREV_pn-webkit-qtopia ?= "26079"
SRCREV_pn-xoo ?= "1623"