[oe-commits] org.oe.dev merge of 'a98e93456176d74c80a713ff53caef9f3ad4027e'

[koen commit]

merge of 'a98e93456176d74c80a713ff53caef9f3ad4027e'
     and 'cea8793a75c42eb3027ed8b7aac39a6bd8cdc931'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 6879e5423a748ebb0ecd47ec29754bec2174502d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6879e5423a748ebb0ecd47ec29754bec2174502d
Files:
1
packages/gnome/gnome-vfs-obexftp_0.4.bb
conf/machine/spitz.conf
Diffs:

#
# mt diff -ra98e93456176d74c80a713ff53caef9f3ad4027e -r6879e5423a748ebb0ecd47ec29754bec2174502d
#
# 
# 
# add_file "packages/gnome/gnome-vfs-obexftp_0.4.bb"
#  content [aa58038301e78a7184bf79d26b2f655af0c62c14]
# 
============================================================
--- packages/gnome/gnome-vfs-obexftp_0.4.bb	aa58038301e78a7184bf79d26b2f655af0c62c14
+++ packages/gnome/gnome-vfs-obexftp_0.4.bb	aa58038301e78a7184bf79d26b2f655af0c62c14
@@ -0,0 +1,8 @@
+DESCRIPTION = "obex plugin for gnome-vfs"
+DEPENDS = "openobex gnome-vfs bluez-utils"
+
+inherit gnome
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs-obexftp/${PV}/${PN}-${PV}.tar.bz2"
+
+


#
# mt diff -rcea8793a75c42eb3027ed8b7aac39a6bd8cdc931 -r6879e5423a748ebb0ecd47ec29754bec2174502d
#
# 
# 
# patch "conf/machine/spitz.conf"
#  from [701e61f30cb9cbf223c603e428c9c0bddf6ba337]
#    to [fb942cabc090e6ba0dd98dc4a57d07867813a6ed]
# 
============================================================
--- conf/machine/spitz.conf	701e61f30cb9cbf223c603e428c9c0bddf6ba337
+++ conf/machine/spitz.conf	fb942cabc090e6ba0dd98dc4a57d07867813a6ed
@@ -13,5 +13,6 @@ MACHINE_GUI_CLASS=bigscreen
 ROOT_FLASH_SIZE = "100"
 
 MACHINE_GUI_CLASS=bigscreen
+MACHINE_DISPLAY_WIDTH_PIXELS=480
+MACHINE_DISPLAY_HEIGHT_PIXELS=640
+MACHINE_DISPLAY_ORIENTATION=270
-MACHINE_DISPLAY_WIDTH_PIXELS=640
-MACHINE_DISPLAY_HEIGHT_PIXELS=480