merge of 'a54a6607517e20ec074b70c4070cfa9d989624e1'

     and 'df64369ee8c68fc382142171ee6ae2a6494e7e74'

5 files changed, 13 insertions, 13 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index df007df044..648da96cb6 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -9502,7 +9502,7 @@ sha256=2ac2154e3f66b5b32ca25d47e3977db115ac6dc52ddb7442ce16e65a4ac1afee
 md5=c703192481d94dfa3f4e24eed22c8182
 sha256=daa670b686f959ab15e457425e57c50f0b973ee4d24d6a4171c33f467961ad1d
 
-[http://www.7-zip.org/dl/lzma417.tar.bz2]
+[http://downloads.sourceforge.net/sevenzip/lzma417.tar.bz2]
 md5=b1ab85e4dc1eb1323d77fef47a2cb71c
 sha256=84124d4501798ecb284fceb28931db023850535e1b1146c884add7b3b0331cbc
 
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 211cad8956..ed9127d760 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -222,8 +222,8 @@ PREFERRED_VERSION_dbh ?= "1.0-18"
 PREFERRED_VERSION_db-native ?= "4.3.29"
 PREFERRED_VERSION_dbus ?= "1.2.1"
 PREFERRED_VERSION_dbus-native ?= "1.2.1"
-PREFERRED_VERSION_dbus-glib ?= "0.74"
-PREFERRED_VERSION_dbus-glib-native ?= "0.74"
+PREFERRED_VERSION_dbus-glib ?= "0.76"
+PREFERRED_VERSION_dbus-glib-native ?= "0.76"
 PREFERRED_VERSION_dbus-native ?= "1.0.3"
 PREFERRED_VERSION_dbus-python ?= "0.71"
 PREFERRED_VERSION_dcetest ?= "1.2"
@@ -1933,6 +1933,8 @@ PREFERRED_VERSION_util-macros ?= "1.1.5"
 PREFERRED_VERSION_util-macros-native ?= "1.1.5"
 PREFERRED_VERSION_uucp ?= "1.07"
 PREFERRED_VERSION_v4l2apps ?= "20020317"
+PREFERRED_VERSION_vala ?= "0.1.5"
+PREFERRED_VERSION_vala-native ?= "0.1.5"
 PREFERRED_VERSION_vde ?= "2.0.2"
 PREFERRED_VERSION_vectoroids ?= "1.1.0"
 PREFERRED_VERSION_videoplayer ?= "0.1"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 3b86c2a539..eed6e42df5 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -49,7 +49,7 @@ SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
 SRCREV_pn-illume ?= "170"
 SRCREV_pn-illume-theme-asu ?= "170"
-SRCREV_pn-illume-theme-freesmartphone ?= "5cdedae0e45911ef10f6966587e7f3e842b5d2bd"
+SRCREV_pn-illume-theme-freesmartphone ?= "0f27c0b52b8dad255349e6c72d590fa787be8c3b"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
@@ -71,7 +71,7 @@ SRCREV_pn-lightmediascanner ?= "68"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1066"
-SRCREV_pn-linux-openmoko ?= "241f69c55ee8f5dd067ebd2d51aa9fdedb212759"
+SRCREV_pn-linux-openmoko ?= "88bf43840b9df0eb0a077a1394eb564be80a412e"
 SRCREV_pn-linux-openmoko-devel ?= "7a1370a816b9348dd8f36a667905dd3533cefc9b"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
@@ -146,13 +146,10 @@ SRCREV_pn-opkg-utils ?= "4534"
 SRCREV_pn-opkg-utils-native ?= "4534"
 SRCREV_pn-oprofileui ?= "173"
 SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5"
+SRCREV_pn-portaudio-v19 ?= "1387"
 SRCREV_pn-psplash ?= "249"
 SRCREV_pn-pty-forward-native ?= "4214"
 SRCREV_pn-python-etk ?= "8b51535150cbc88467e3d8b578e54df27eac643"
-SRCREV_pn-python-odeviced ?= "fcf6f975b18d478ce618284c0dcc2f28f5c43cc1"
-SRCREV_pn-python-oeventd ?= "9053e5be847d694681c3664664ed669543a0a777"
-SRCREV_pn-python-ophoned ?= "82c318b8592588bc7ce8bccdfc090e59cfc9b98c"
-SRCREV_pn-python-ousaged ?= "836c091405eea3e29efdba3e1351befd1c96267b"
 SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
 SRCREV_pn-pylgrim ?= "20"
 SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index 46bd42f2a2..57d81c2ade 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -1,7 +1,7 @@
 #-----------------------------------------------------------------------------
 #@TYPE: Machine
-#@NAME: FIC GTA01 (Neo1973)
-#@DESCRIPTION: Machine configuration for the FIC Neo1973/1 GSM phone
+#@NAME: FIC GTA01 (Neo 1973)
+#@DESCRIPTION: Machine configuration for the FIC Neo 1973 GSM phone
 #-----------------------------------------------------------------------------
 
 TARGET_ARCH = "arm"
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 45dc0518a4..88aa3881c7 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -1,7 +1,7 @@
 #-----------------------------------------------------------------------------
 #@TYPE: Machine
-#@NAME: FIC GTA02 (Neo1973)
-#@DESCRIPTION: Machine configuration for the FIC Neo1973/2 GSM phone
+#@NAME: Openmoko GTA02 (NeoFreerunner)
+#@DESCRIPTION: Machine configuration for the Openmoko NeoFreerunner GSM phone
 #-----------------------------------------------------------------------------
 
 TARGET_ARCH = "arm"
@@ -29,6 +29,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-snd-soc-neo1973-gta02-wm8753 \
 "
 
+# no need to bypass this as in om-gta01, since this model is not using a multiplexed ttySAC0
 SERIAL_CONSOLE = "115200 ttySAC2"
 
 # used by some images