From: Graeme Gregory <dp@xora.org.uk>
Date: Fri, 21 Mar 2008 02:08:23 +0000 (+0000)
Subject: merge of '178eac00dc5aa8338d42e8e203633bec7817bbf6'
X-Git-Tag: Release-2010-05/1~7106^2^2~3^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46858d01adf23692e92e456b0d2f8f2f9fe4be45;p=openembedded.git

Merge ... '178eac00dc5aa8338d42e8e203633bec7817bbf6'
     and 'b0ef17921f71badc490ceaad45b8ac8d0b434937'
---

46858d01adf23692e92e456b0d2f8f2f9fe4be45
diff --cc conf/distro/include/sane-srcrevs.inc
index fc111e03fe,f9d4d8db11..e871e92473
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@@ -131,17 -131,17 +131,18 @@@ SRCREV_pn-openmoko-theme-standard-qvga 
  SRCREV_pn-openmoko-theme-standard2 ?= "3425"
  SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425"
  SRCREV_pn-openmoko-today ?= "3056"
 -SRCREV_pn-openmoko-today2 ?= "3609"
 -SRCREV_pn-openmoko-today2-folders ?= "3414"
 +SRCREV_pn-openmoko-today2 ?= "4168"
 +SRCREV_pn-openmoko-today2-folders ?= "3704"
  SRCREV_pn-openmoko-toolchain-scripts ?= "3767"
  SRCREV_pn-openmoko-worldclock2 ?= "3365"
 -SRCREV_pn-openocd ?= "206"
 -SRCREV_pn-openocd-native ?= "206"
 -SRCREV_pn-opkg ?= "4142"
 -SRCREV_pn-opkg-native ?= "4142"
 +SRCREV_pn-openocd ?= "517"
 +SRCREV_pn-openocd-native ?= "517"
 +SRCREV_pn-opkg ?= "4210"
 +SRCREV_pn-opkg-native ?= "4210"
 +SRCREV_pn-opkg-sdk ?= "4209"
  SRCREV_pn-oprofileui ?= "160"
  SRCREV_pn-psplash ?= "249"
+ SRCREV_pn-pty-forward-native ?= "4214"
  SRCREV_pn-pylgrim ?= "20"
  SRCREV_pn-pyneod ?= "88"
  SRCREV_pn-pyneog ?= "88"
diff --cc packages/openmoko2/openmoko-session2.bb
index f9db990e83,b7d4128eac..26eb6556e1
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@@ -1,9 -1,10 +1,9 @@@
  DESCRIPTION = "Custom Matchbox session files for OpenMoko"
 -SECTION = "x11"
  LICENSE = "GPL"
 -RDEPENDS = "matchbox-panel-2"
 -RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2 openmoko-panel-memory"
 +SECTION = "x11"
- RDEPENDS_${PN} = "matchbox-panel-2 openmoko-common2 openmoko-today2 openmoko-dialer2"
++RDEPENDS = "matchbox-panel-2 openmoko-common2 openmoko-today2 openmoko-dialer2 openmoko-panel-memory"
  RCONFLICTS_${PN} = "openmoko-session matchbox-common"
- PR = "r65"
+ PR = "r66"
  
  SRC_URI = "\
    file://etc \
@@@ -44,10 -42,11 +42,12 @@@ gconftool-2 --config-source=xml::$D${sy
  # gstreamer audio settings
  gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosink pulsesink
  gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosrc pulsesrc
 +
  }
  
- PACKAGE_ARCH = "all"
+ ALTERNATIVE_NAME = "x-window-manager"
+ ALTERNATIVE_PATH = "${bindir}/matchbox-session"
+ ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ ALTERNATIVE_PRIORITY = "11"
  
  CONFFILES_${PN} = "${sysconfdir}/matchbox/session"
-