From: Holger Freyther <zecke@selfish.org>
Date: Fri, 25 Apr 2008 15:03:16 +0000 (+0000)
Subject: merge of '3e22c6ee5af012d09e9027c2ade50920300fb0f2'
X-Git-Tag: Release-2010-05/1~7106^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2a22aee1c2b8ad06911c95d58e342dc2f321e0a;p=openembedded.git

Merge ... '3e22c6ee5af012d09e9027c2ade50920300fb0f2'
     and 'f360c05bdca8536435cf09d573b42b34d69224ff'
---

b2a22aee1c2b8ad06911c95d58e342dc2f321e0a
diff --cc conf/distro/include/sane-srcrevs.inc
index b42f915bbb,a3569ff226..bc86ba7e67
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@@ -146,26 -137,25 +146,30 @@@ SRCREV_pn-openmoko-toolchain-scripts ?
  SRCREV_pn-openmoko-worldclock2 ?= "3365"
  SRCREV_pn-openocd ?= "517"
  SRCREV_pn-openocd-native ?= "517"
 -SRCREV_pn-opkg ?= "4235"
 -SRCREV_pn-opkg-native ?= "4235"
 -SRCREV_pn-opkg-sdk ?= "4235"
 +SRCREV_pn-opkg ?= "4247"
 +SRCREV_pn-opkg-native ?= "4247"
 +SRCREV_pn-opkg-sdk ?= "4247"
  SRCREV_pn-oprofileui ?= "160"
 +SRCREV_pn-packagekit ?= "432046796fa420f57ab6c71081f7ba14e9a92574"
  SRCREV_pn-psplash ?= "249"
+ SRCREV_pn-pty-forward-native ?= "4214"
 +SRCREV_pn-py-odeviced ?= "190"
  SRCREV_pn-pylgrim ?= "20"
  SRCREV_pn-pyneod ?= "88"
  SRCREV_pn-pyneog ?= "88"
  SRCREV_pn-python-formencode = "3148"
 -SRCREV_pn-python-gsmd = "127"
 +SRCREV_pn-python-gsmd = "148"
  SRCREV_pn-python-lightmediascanner = "68"
 +SRCREV_pn-python-pyrtc = "152"
  SRCREV_pn-s3c24xx-gpio ?= "4130"
 +SRCREV_pn-settings-daemon ?= "2006"
+ SRCREV_pn-serial-forward ?= "4214"
 +SRCREV_pn-sjf2410-linux-native ?= "4268"
+ SRCREV_pn-settings-daemon ?= "1755"
+ SRCREV_pn-sjf2410-linux-native ?= "933"
  SRCREV_pn-sphyrna ?= "45"
  SRCREV_pn-tmut ?= "60"
 -SRCREV_pn-u-boot-openmoko ?= "4138"
 +SRCREV_pn-u-boot-openmoko ?= "4297"
  SRCREV_pn-usbpath ?= "3172"
  SRCREV_pn-usbpath-native ?= "3172"
  SRCREV_pn-webkit-gtk ?= "30762"
diff --cc packages/alsa/alsa-state.bb
index 7d57364292,fa9dbe0fb8..d13b9d8270
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@@ -7,9 -7,8 +7,9 @@@
  DESCRIPTION = "Default ALSA configuration"
  LICENSE = "GPL"
  RRECOMMENDS_alsa-state = "alsa-states"
 +RRECOMMENDS_${PN}_openmoko = "openmoko-alsa-scenarios"
  PV = "0.1.0"
- PR = "r12"
 -PR = "r14"
++PR = "r15"
  
  SRC_URI = " \
    file://asoundrc \