[oe-commits] org.oe.dev merge of '36abf7efee02c5e3db7a7239d57a793afbf6452a'

[oe commit]

merge of '36abf7efee02c5e3db7a7239d57a793afbf6452a'
     and '92611c6d615003e779f40cd25bf609edd0822a6a'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 08f4abe0b59e692c9044f0c59f6e046959c301f2
ViewMTN: http://monotone.openembedded.org/revision.psp?id=08f4abe0b59e692c9044f0c59f6e046959c301f2
Files:
1
packages/fluxbox/fluxbox_0.99+1.0rc.bb
packages/openmoko2/neod_svn.bb
packages/openmoko2/openmoko-session2/etc/matchbox/session
packages/openmoko2/openmoko-session2.bb
Diffs:

#
# mt diff -r36abf7efee02c5e3db7a7239d57a793afbf6452a -r08f4abe0b59e692c9044f0c59f6e046959c301f2
#
# 
# 
# patch "packages/fluxbox/fluxbox_0.99+1.0rc.bb"
#  from [1cb1c0fa7894a09de7c0c9d3612653bea405ec61]
#    to [d176450b6c987ffa0fd0a593403eaa78b75a1a29]
# 
============================================================
--- packages/fluxbox/fluxbox_0.99+1.0rc.bb	1cb1c0fa7894a09de7c0c9d3612653bea405ec61
+++ packages/fluxbox/fluxbox_0.99+1.0rc.bb	d176450b6c987ffa0fd0a593403eaa78b75a1a29
@@ -57,7 +57,7 @@ FILES_${PN}-gpe = "${datadir}/fluxbox/ap
 FILES_${PN}-gpe = "${datadir}/fluxbox/apps.gpe* \
 		   ${datadir}/fluxbox/keys.* \
 		   ${bindir}/gpe-logout.fluxbox \
-		   ${sysconfdir}keylaunchrc.fluxbox \
+		   ${sysconfdir}/keylaunchrc.fluxbox \
 		   ${datadir}/fluxbox/styles/gpe-default \
 		   ${datadir}/fluxbox/session \
 		   ${bindir}/fluxbox-gpe-session"


#
# mt diff -r92611c6d615003e779f40cd25bf609edd0822a6a -r08f4abe0b59e692c9044f0c59f6e046959c301f2
#
# 
# 
# patch "packages/openmoko2/neod_svn.bb"
#  from [bfa00226eb82fd491b6d775eeacd10983e63a348]
#    to [1a65c15befb7c079bbe46943fda29a440e45ab5c]
# 
# patch "packages/openmoko2/openmoko-session2/etc/matchbox/session"
#  from [e398e656f610ac2f0f3a133d0382426f823245ab]
#    to [ed1a438b5a4f8b18384d223b866c8184e3ee15c8]
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [547b4c85468fe2a49b7ccf02bcd3340678ff487b]
#    to [a2ff88b8fef6a076a6682858bd847bf0dc7ecb8f]
# 
============================================================
--- packages/openmoko2/neod_svn.bb	bfa00226eb82fd491b6d775eeacd10983e63a348
+++ packages/openmoko2/neod_svn.bb	1a65c15befb7c079bbe46943fda29a440e45ab5c
@@ -1,6 +1,6 @@ SECTION = "openmoko/daemons"
 DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management"
 SECTION = "openmoko/daemons"
-DEPENDS = "gtk+ pulseaudio"
+DEPENDS = "gconf gtk+ pulseaudio"
 PV = "0.1.0+svn${SVNREV}"
 PR = "r0"
 
============================================================
--- packages/openmoko2/openmoko-session2/etc/matchbox/session	e398e656f610ac2f0f3a133d0382426f823245ab
+++ packages/openmoko2/openmoko-session2/etc/matchbox/session	ed1a438b5a4f8b18384d223b866c8184e3ee15c8
@@ -7,5 +7,5 @@ matchbox-window-manager -use_titlebar ye
 
 matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ &
 
-exec matchbox-panel-2 --start-applets showdesktop,systray,startup \
+exec matchbox-panel-2 --start-applets systray,startup \
   --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock --titlebar
============================================================
--- packages/openmoko2/openmoko-session2.bb	547b4c85468fe2a49b7ccf02bcd3340678ff487b
+++ packages/openmoko2/openmoko-session2.bb	a2ff88b8fef6a076a6682858bd847bf0dc7ecb8f
@@ -1,9 +1,9 @@ RCONFLICTS = "openmoko-session"
 DESCRIPTION = "Custom MB session files for poky"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
 RCONFLICTS = "openmoko-session"
-PR = "r23"
+PR = "r24"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}