[oe-commits] org.oe.dev merge of '3ad0844ce9d5f38938193e537eef14f3eedc5aaa'

[freyther commit]

merge of '3ad0844ce9d5f38938193e537eef14f3eedc5aaa'
     and 'c6487ccb0affa59758f32bd6af992ddd0508d2b5'

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 67b9fc3825c737543cbee961c14ac72eb245d2c5
ViewMTN: http://monotone.openembedded.org/revision/info/67b9fc3825c737543cbee961c14ac72eb245d2c5
Files:
1
packages/qtopia-phone/qtopia-phone-x11/qtopia.sh
packages/openmoko-projects/assassin_svn.bb
packages/openmoko2/openmoko-session2.bb
Diffs:

#
# mt diff -r3ad0844ce9d5f38938193e537eef14f3eedc5aaa -r67b9fc3825c737543cbee961c14ac72eb245d2c5
#
#
#
# patch "packages/qtopia-phone/qtopia-phone-x11/qtopia.sh"
#  from [c955894686aae5510c5b36db674c9f457416616c]
#    to [14600d791e31540ce23ce74084b05c424a136b7f]
#
============================================================
--- packages/qtopia-phone/qtopia-phone-x11/qtopia.sh	c955894686aae5510c5b36db674c9f457416616c
+++ packages/qtopia-phone/qtopia-phone-x11/qtopia.sh	14600d791e31540ce23ce74084b05c424a136b7f
@@ -1,4 +1,4 @@ export QPEDIR=/opt/Qtopia
 #!/bin/sh
 export QPEDIR=/opt/Qtopia
-export PATH=$PATH=$QPEDIR/bin
+export PATH=$PATH:$QPEDIR/bin
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$QPEDIR/lib


#
# mt diff -rc6487ccb0affa59758f32bd6af992ddd0508d2b5 -r67b9fc3825c737543cbee961c14ac72eb245d2c5
#
#
#
# patch "packages/openmoko-projects/assassin_svn.bb"
#  from [138a3c3ebad00edd5369a922d879c6435db33028]
#    to [ec54896d60155ed78661fbb53074c68150c9077c]
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [ec58d62219eb5fa1b3bed5608b3790a16aaba3cd]
#    to [26ae36265f0efa54a6da1e33133c200e862bba74]
#
============================================================
--- packages/openmoko-projects/assassin_svn.bb	138a3c3ebad00edd5369a922d879c6435db33028
+++ packages/openmoko-projects/assassin_svn.bb	ec54896d60155ed78661fbb53074c68150c9077c
@@ -1,9 +1,9 @@ LICENSE = "GPL"
 DESCRIPTION = "Action GUI for Installer"
 HOMEPAGE = "http://assassin.projects.openmoko.org/"
 LICENSE = "GPL"
-DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit"
+DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus"
 PV = "0.2+svn${SRCREV}"
-PR = "r2"
+PR = "r4"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https"
 
============================================================
--- packages/openmoko2/openmoko-session2.bb	ec58d62219eb5fa1b3bed5608b3790a16aaba3cd
+++ packages/openmoko2/openmoko-session2.bb	26ae36265f0efa54a6da1e33133c200e862bba74
@@ -1,10 +1,10 @@ SECTION = "x11"
 DESCRIPTION = "Custom Matchbox session files for OpenMoko"
 LICENSE = "GPL"
 SECTION = "x11"
-RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
+RDEPENDS = "matchbox-panel-2"
 RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
 RCONFLICTS_${PN} = "openmoko-session matchbox-common"
-PR = "r64"
+PR = "r65"
 
 SRC_URI = "\
   file://etc \