[oe-commits] org.oe.dev merge of '6fc0c96303daaec8c718677c1ab7b0cc440ab4be'

[oe commit]

merge of '6fc0c96303daaec8c718677c1ab7b0cc440ab4be'
     and 'f2599a639a2bce74fd29be0a3fe3b529e9d37493'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 30d6a9a8f183fa3269a65f234e3bf92f0da8eff5
ViewMTN: http://monotone.openembedded.org/revision/info/30d6a9a8f183fa3269a65f234e3bf92f0da8eff5
Files:
1
packages/openmoko2/openmoko-session2.bb
packages/gnome/gvfs_0.0.2.bb
packages/gnome/gio-standalone_0.1.2.bb
Diffs:

#
# mt diff -r6fc0c96303daaec8c718677c1ab7b0cc440ab4be -r30d6a9a8f183fa3269a65f234e3bf92f0da8eff5
#
# 
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [a4e57156caaece7b3fd09e98c9f541594ba4879b]
#    to [fbe2c5b1b35022fd032e2c27d0770f76a8a26d9e]
# 
============================================================
--- packages/openmoko2/openmoko-session2.bb	a4e57156caaece7b3fd09e98c9f541594ba4879b
+++ packages/openmoko2/openmoko-session2.bb	fbe2c5b1b35022fd032e2c27d0770f76a8a26d9e
@@ -1,10 +1,10 @@ RCONFLICTS_${PN} = "openmoko-session mat
 DESCRIPTION = "Custom Matchbox session files for OpenMoko"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
 RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
 RCONFLICTS_${PN} = "openmoko-session matchbox-common"
-PR = "r61"
+PR = "r62"
 
 SRC_URI = "\
   file://etc \
@@ -12,6 +12,13 @@ S = ${WORKDIR}
 "
 S = ${WORKDIR}
 
+inherit update-alternatives
+
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PATH = "${bindir}/matchbox-session"
+ALTERNATIVE_PRIORITY = "11"
+
 do_install() {
 	install -d ${D}${bindir}
 	install -m 0655 ${WORKDIR}/matchbox-session ${D}${bindir}


#
# mt diff -rf2599a639a2bce74fd29be0a3fe3b529e9d37493 -r30d6a9a8f183fa3269a65f234e3bf92f0da8eff5
#
# 
# 
# add_file "packages/gnome/gvfs_0.0.2.bb"
#  content [f6a1956df3fb38a2a4e81a8d235573b19c19f3c5]
# 
# patch "packages/gnome/gio-standalone_0.1.2.bb"
#  from [9ddf6ad7b5475f003e97798a94d4aa704dc1be56]
#    to [3c0bd38cf4990797b3925367af21c85074935b0f]
# 
============================================================
--- packages/gnome/gvfs_0.0.2.bb	f6a1956df3fb38a2a4e81a8d235573b19c19f3c5
+++ packages/gnome/gvfs_0.0.2.bb	f6a1956df3fb38a2a4e81a8d235573b19c19f3c5
@@ -0,0 +1,22 @@
+DESCRIPTION = "gvfs is a userspace virtual filesystem"
+LICENSE = "LGPL"
+DEPENDS = "glib-2.0 gio-standalone fuse"
+PR = "r0"
+
+inherit gnome
+
+EXTRA_OECONF = "--disable-samba"
+
+PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash"
+
+FILES_${PN} += "${datadir}/dbus-1/services/* ${libdir}/gio/modules/*.so"
+FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*"
+FILES_${PN}-dev += "${libdir}/gio/modules/*.la"
+
+FILES_gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${sysconfdir}/gvfs/mounts/ftp.mount"
+FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${sysconfdir}/gvfs/mounts/sftp.mount"
+FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${sysconfdir}/gvfs/mounts/trash.mount"
+
+do_stage() {
+	autotools_stage_all
+}
============================================================
--- packages/gnome/gio-standalone_0.1.2.bb	9ddf6ad7b5475f003e97798a94d4aa704dc1be56
+++ packages/gnome/gio-standalone_0.1.2.bb	3c0bd38cf4990797b3925367af21c85074935b0f
@@ -7,3 +7,8 @@ FILES_libgio = "${libdir}/libgio.so.*"
 
 PACKAGES =+ "libgio"
 FILES_libgio = "${libdir}/libgio.so.*"
+
+do_stage() {
+	autotools_stage_all
+}
+