merge of '88e2766fe8aa4c69dc8688e0554e2e6d05bb9c67'

     and 'f556521018478109967b108bb830f8109aefbb0e'

11 files changed, 61 insertions, 10 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 5c6109ba17..66d2cf6f03 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -602,6 +602,10 @@ sha256=7a17403ac478cae0d837461b7efcd9075b17c6e7f3e2221fe1f2fdbd14f11dcf
 md5=1ef39fb723f9209109134d6f4860cb21
 sha256=01e693daf4c0e2af2e10082a635559d390f9127556a86d25105abfa646a9b0a3
 
+[ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.15.tar.bz2]
+md5=94254ea0d2c966a58184b134e9da29ff
+sha256=f24272f3a32262c5285fc5bae0b9aa65494e8b22ac536313dbb60b8e4231e952
+
 [ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-1.0.11.tar.bz2]
 md5=3106c2d59a329263867fa3dd44133dda
 sha256=6b688a3895a14945d0622e16cfdb9292ef9f953ab2d195b08595736f76e5a790
@@ -622,6 +626,10 @@ sha256=d7fe8a7995bc74331c89fbc1937a0682d239339d6659a402cd7b8e4b96c050f0
 md5=6d3009c157ac6fc803696d6590a48366
 sha256=307d630f0ed15e7e92fa35dc0c961737fa9aed22bd7a4a6054a72f85145fa5cb
 
+[ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.15.tar.bz2]
+md5=287f46f891581c15018de4f8c0731575
+sha256=3bb546e873df39159812168180eeff14b13620c653d90739ac0a0912e898aeac
+
 [http://osdn.dl.sourceforge.jp/anthy/20510/anthy-7811.tar.gz]
 md5=e3619c07bd175ce5f73d67388c0c2ea5
 sha256=140828e8aa7d690d8f2a9a54faeac38bcbf40ea18c1f44a186af51bd6964cd13
@@ -1110,6 +1118,10 @@ sha256=fe6de9ccfab9e9fbdbe1a2cbe4a9ea771d1a2efc7f2122a2350214394587ff39
 md5=9d7e02ea9a4c43d8f030500f282ee8bf
 sha256=cf37ac1eb3ec0c473e527f11f068fc5fcc7452d688acc89a0e52553f51fc36bb
 
+[http://bluez.sourceforge.net/download/bluez-libs-3.23.tar.gz]
+md5=8f0368c6213abef36f1e563b44b2eed4
+sha256=3ea7817c91b8cff9cacba23392f4a4163412d92ee09236997622e0d19cad884e
+
 [http://bluez.sourceforge.net/download/bluez-libs-3.4.tar.gz]
 md5=8b73b0ccbcef6a4270468487b1309990
 sha256=6c40f8b2dcf9359cc7f6afa803fc5744652c1d95669c134b975758a8748a87e8
@@ -1134,6 +1146,10 @@ sha256=f8f242c6835ae826bf1f4eaee6c50d47d6208715e45450ba42c1769094c3f296
 md5=ef596746d656ed034ed64596f72ef3c2
 sha256=5ed4245e31fa43789a3090d02a25ed90eaee95819cce30cda59d4d09f4fc0db0
 
+[http://bluez.sourceforge.net/download/bluez-utils-3.23.tar.gz]
+md5=767ad814bff4e1806f873ecf2434ba89
+sha256=4f3d52cc207e438018b3a4c307d9969862bf25c35b1e281c0d6201b624acd103
+
 [http://bluez.sourceforge.net/download/bluez-utils-3.4.tar.gz]
 md5=f63b440396baee7dee9259395a205d48
 sha256=44a50104072a39e4f941ab68b6ffce5feb2fec7a94f3dd32f0945939d09eca39
@@ -1506,6 +1522,10 @@ sha256=80fd209d065887729fdeb81f5a91638626e7ed31dabab40c446bd12042df9057
 md5=c0b57a115e24005f9828ca7b53908779
 sha256=f0127ba9cd9936b08f982999f6fd9004c8c4b97401e68bda4d91eec29300d8bd
 
+[http://www.cmake.org/files/v2.4/cmake-2.4.7.tar.gz]
+md5=4476c423b8f74266136964e42ea88028
+sha256=2fd5feb294b933ae3a0071b8c7a396797cf79dfe6b0ffeff8788e07ff4107d56
+
 [ftp://ftp.logilab.fr/pub/common/common-0.4.4.tar.gz]
 md5=4cd3ce38efbd27c6cf4223f0ced2a5b5
 sha256=21341f1900b0fe919a2ad057c334f5d7172588e4262b3d1b0904da03a9db0cff
@@ -2382,6 +2402,10 @@ sha256=6f51ebdf0e18bea58d18f79e8ffebb797fe57bdf44b96dff9d84b70467af7841
 md5=3654bbbf01deeb0d804df194e1b1a2b3
 sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce
 
+[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.7.1.tar.gz]
+md5=3654bbbf01deeb0d804df194e1b1a2b3
+sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce
+
 [ftp://oss.sgi.com/projects/fam/download/stable/fam-2.6.10.tar.gz]
 md5=1c5a2ea659680bdd1e238d7828a857a7
 sha256=885ced3480aef3cee519a459a572e31cd2fd5e24bcd35b1d0c8833361699026e
@@ -2762,6 +2786,11 @@ sha256=13f59a7cd5190983412689495c399444cf73c1ced0813149e4480c8848bb9f17
 md5=f035852f521b54677f2b5c9e2f6d54a4
 sha256=63a3d6413182817b91eea327b58c243f1865acfc40bef61fc52d2b0431341363
 
+[https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h]
+md5=c0124afc760d4fe8c24ffcf15ba7f391
+sha256=4e0c1726f9c565deec6d6af9eebda47ca6dea473f3280cc89beb321ae33ff962
+
+
 [http://openzaurus.org/mirror/fonts-bitstream-vera-sans-mono.tar.gz]
 md5=890615fa4b3e6c82cd1b9807b106f042
 sha256=42c15ed555719c27f67990454cdda791cbcd26ab98712fd88ca7e20e6ce3f1fd
@@ -4550,6 +4579,10 @@ sha256=5dc5cf08502510a00cecd6e04ef006a74ba7ed4b31d25187b5efadd70a78733b
 md5=a6f532770cf9286e1de38d6570cbc6bc
 sha256=65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d
 
+[http://people.freedesktop.org/~david/dist/hal-info-20070618.tar.gz]
+md5=c7005ccb1765d8359fd2348350770495
+sha256=bec1b0ad166b6c4d5269e7aa6d7bdbd0eb05c8f2c30042e4dca18993ba5682f0
+
 [http://downloads.sourceforge.net/haserl/haserl-0.8.0.tar.gz]
 md5=bd9195d086566f56634c0bcbbbcbebea
 sha256=ba261a21539e1f204ba74590d313c501007e546b54aa9ae7210a99eaf3c097be
@@ -7898,6 +7931,10 @@ sha256=9416376952812e5b479745d67a2bf874fbcad10137517314ce7de37abb756df8
 md5=843422d90349800ee721f6710d051c87
 sha256=df551fb075d5e6d0824b74d231962cf0e104c43f646e233675d952ef3c03debc
 
+[http://www.mpfr.org/mpfr-2.3.0/mpfr-2.3.0.tar.bz2]
+md5=cf7c743e4be122e63eb6f372fc58b657
+sha256=359f0d344f92d1f145ddcd37adf54f9b8069aa2ce89c4a19603d080ef17d2d48
+
 [http://downloads.sourceforge.net/mpg321/mpg321-0.2.10.tar.gz]
 md5=bb403b35c2d25655d55f0f616b8f47bb
 sha256=db0c299592b8f1f704f41bd3fc3a2bf138658108588d51af61638c551af1b0d4
@@ -8658,6 +8695,10 @@ sha256=46e20652ae4b9ceab5879ab939ec3eb2e57de742ea734272749ca53c93a20339
 md5=6a33888e34c23f7fde09a6e94e4f5950
 sha256=6e3549b8586d8ac3ae8b2251b6cff9065f12a5d648c9c464543988ddb670545b
 
+[http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.2.31.tar.bz2]
+md5=3aa902cb7a57a4aa09427de603ebf17b
+sha256=3d087c88f6e2cc8fde8d2ab12ff2f85ca3ecb2c67754d0483d158f2e5802b015
+
 [http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/pax-utils-0.1.13.tar.bz2]
 md5=5f09df47a16e83462384b44b75310539
 sha256=72f3cdad93b5436070dcc63b67764a06c594f324ccc001e8bfb974a8d1a86f36
@@ -8778,6 +8819,10 @@ sha256=468f25a70ef2dac90088caa6599c41ade6768e0cdc328dc3e82ab578903e69d4
 md5=f9fea77e46ec7a3a16e925e137f146e7
 sha256=a9d4545b5dfc018cdd33fd21bc73c3f1b3c9c207f1bb6843606cc180eb10c6c8
 
+[http://cairographics.org/releases/pixman-0.9.6.tar.gz]
+md5=d2b1071cdbb0b8da18039111ba2dfd22
+sha256=179abc613f5100081cdef833f24a35fe7b646b8a4f0c79647d9609f6bf8222d8
+
 [http://pkgconfig.freedesktop.org/releases/pkg-config-0.22.tar.gz]
 md5=fd5c547e9d66ba49bc735ccb8c791f2a
 sha256=7e0761b47d604847006e7c6caa9b9cf044530a516ff84395450edcfa3c2febe6
diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf
index 6d3ad7bd6b..25b07e0038 100644
--- a/conf/distro/amsdelta-oe.conf
+++ b/conf/distro/amsdelta-oe.conf
@@ -2,7 +2,7 @@ DISTRO = "amsdelta-oe"
 DISTRO_NAME = "AmsDelta Linux"
 DISTRO_VERSION = "unstable-${DATE}"
 
-require conf/distro/angstrom-2007.1.conf
+require conf/distro/angstrom-2008.1.conf
 
 
 DISTRO_TYPE = "debug"
diff --git a/conf/distro/angstrom-2007.1-legacy.conf b/conf/distro/angstrom-2007.1-legacy.conf
index 298c8589e3..358ed06cf2 100644
--- a/conf/distro/angstrom-2007.1-legacy.conf
+++ b/conf/distro/angstrom-2007.1-legacy.conf
@@ -4,6 +4,6 @@
 #      * no sysfs
 #      * no EABI for ARM
 
-require conf/distro/angstrom-2007.1.conf
+require conf/distro/angstrom-2008.1.conf
 
 # We'll have to fill this in as we go.
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index ff7636e686..d833fe922f 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -6,11 +6,15 @@
 #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille-media.de>
 #@--------------------------------------------------------------------
 
-# This is a testbed for unstable and/or untested things, while angstrom-2007.1 
-# is aiming for stability and a release.
+# This is a aimed to be the next stable angstrom release. 
+# If you want something stable *right now*, use angstrom-2007.1
+# with the org.openembedded.angstrom-2007.12-stable branch
+#
 # Use this at your own risk, we welcome bugreports filed at 
 #    http://bugs.openembedded.org
-# In doubt, use DISTRO="angstrom-2007.1"
+#
+# Again, in doubt, use DISTRO="angstrom-2007.1" with the 
+# org.openembedded.angstrom-2007.12-stable branch
 
 #DISTRO_VERSION = "2008.1"
 DISTRO_VERSION = "2008.1-test-${DATE}"
diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf
index 234c92f62a..fe079db92d 100644
--- a/conf/distro/foonas.conf
+++ b/conf/distro/foonas.conf
@@ -8,7 +8,7 @@
 
 FOONAS_MODE ?= "glibc"
 ANGSTROM_MODE = ${FOONAS_MODE}
-require conf/distro/angstrom-2007.1.conf
+require conf/distro/angstrom-2008.1.conf
 
 DISTRO = "foonas"
 DISTRO_NAME = "foonas"
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/include/angstrom-2007-for-openmoko.inc
index 380c882c2c..380c882c2c 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/include/angstrom-2007-for-openmoko.inc
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index 97fed90f21..82c31cb64a 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -1594,7 +1594,7 @@ PREFERRED_VERSION_qpe-inputhelper-applet ?= "1.0.0"
 PREFERRED_VERSION_qpe-libgaim ?= "1.5.0"
 PREFERRED_VERSION_qpealarmclock ?= "1.0.9"
 PREFERRED_VERSION_qpealarmclockapplet ?= "1.0.9"
-PREFERRED_VERSION_qpegps ?= "0.9.3"
+PREFERRED_VERSION_qpegps ?= "0.9.3.1"
 PREFERRED_VERSION_qpenmapfe ?= "1.0.0"
 PREFERRED_VERSION_qpf-arabic ?= "1.0"
 PREFERRED_VERSION_qpf-bitstream-vera ?= "1.10"
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 9f8ae61fc3..87fea8d622 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -44,6 +44,8 @@ SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
 SRCREV_pn-openocd ?= "${AUTOREV}"
 SRCREV_pn-openocd-native ?= "${AUTOREV}"
 
+SRCREV_pn-python-gsmd ?= "${AUTOREV}"
+
 SRCREV_pn-u-boot-openmoko ?= "${AUTOREV}"
 SRCREV_pn-dfu-util ?= "${AUTOREV}"
 SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 5446a425ce..af96ae435a 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -42,7 +42,7 @@ SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
-SRCREV_pn-linux-ixp4xx ?= "927"
+SRCREV_pn-linux-ixp4xx ?= "957"
 SRCREV_pn-linux-openmoko ?= "3238"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
diff --git a/conf/distro/mokoslug.conf b/conf/distro/mokoslug.conf
index 2c039dbcce..d68a03fa2b 100644
--- a/conf/distro/mokoslug.conf
+++ b/conf/distro/mokoslug.conf
@@ -6,7 +6,7 @@
 #@--------------------------------------------------------------------
 
 # MokoSlug is based on Angstrom, and would hopefully just be done by features one day ...
-require conf/distro/angstrom-2007.1.conf
+require conf/distro/angstrom-2008.1.conf
 
 DISTRO = "mokoslug"
 DISTRO_NAME = "MokoSlug"
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index f2007c231f..e3ddd2165b 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Linux Distribution Configuration for the OpenMoko Platform
 #-----------------------------------------------------------------------------
 
-require conf/distro/angstrom-2007.1.conf
+require conf/distro/include/angstrom-2007-for-openmoko.inc
 
 #
 # Header