Merge branch 'org.openembedded.dev' of ssh+git://git@git.openembedded.net/openembedded into org.openembedded.dev

13 files changed, 13 insertions, 9 deletions

diff --git a/recipes/flac/flac.inc b/recipes/flac/flac.inc
index d20dacde58..b90abd3278 100644
--- a/recipes/flac/flac.inc
+++ b/recipes/flac/flac.inc
@@ -12,6 +12,7 @@ inherit autotools
 EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \
 		--with-ogg-libraries=${STAGING_LIBDIR} \
 		--with-ogg-includes=${STAGING_INCDIR} \
+                --disable-xmms-plugin \
 		--without-xmms-prefix \
 		--without-xmms-exec-prefix \
 		--without-libiconv-prefix \
diff --git a/recipes/gnome-mplayer/gnome-mplayer_svn.bb b/recipes/gnome-mplayer/gnome-mplayer_svn.bb
index 5540f94732..2769bcbfe9 100644
--- a/recipes/gnome-mplayer/gnome-mplayer_svn.bb
+++ b/recipes/gnome-mplayer/gnome-mplayer_svn.bb
@@ -1,7 +1,7 @@
 require gnome-mplayer.inc
 
-SRCREV = "1569"
-PV = "0.9.8+svnr${SRCPV}"
+SRCREV = "1583"
+PV = "0.9.8+svn${SRCPV}"
 PR = "r0"
 S = "${WORKDIR}/trunk"
 
diff --git a/recipes/gnome/gdm-2.28.0/%gconf-tree.xml b/recipes/gnome/gdm-2.28.1/%gconf-tree.xml
index f8c2e9cc20..f8c2e9cc20 100644
--- a/recipes/gnome/gdm-2.28.0/%gconf-tree.xml
+++ b/recipes/gnome/gdm-2.28.1/%gconf-tree.xml
diff --git a/recipes/gnome/gdm-2.28.0/cross-xdetection.diff b/recipes/gnome/gdm-2.28.1/cross-xdetection.diff
index 150f79763a..150f79763a 100644
--- a/recipes/gnome/gdm-2.28.0/cross-xdetection.diff
+++ b/recipes/gnome/gdm-2.28.1/cross-xdetection.diff
diff --git a/recipes/gnome/gdm-2.28.0/gdm b/recipes/gnome/gdm-2.28.1/gdm
index 43eae95177..43eae95177 100755
--- a/recipes/gnome/gdm-2.28.0/gdm
+++ b/recipes/gnome/gdm-2.28.1/gdm
diff --git a/recipes/gnome/gdm-2.28.0/gdm-nodocs.patch b/recipes/gnome/gdm-2.28.1/gdm-nodocs.patch
index 395fa627eb..395fa627eb 100644
--- a/recipes/gnome/gdm-2.28.0/gdm-nodocs.patch
+++ b/recipes/gnome/gdm-2.28.1/gdm-nodocs.patch
diff --git a/recipes/gnome/gdm-2.28.0/gdm-pam b/recipes/gnome/gdm-2.28.1/gdm-pam
index f9fafed9d6..f9fafed9d6 100644
--- a/recipes/gnome/gdm-2.28.0/gdm-pam
+++ b/recipes/gnome/gdm-2.28.1/gdm-pam
diff --git a/recipes/gnome/gdm-2.28.0/gdm.conf b/recipes/gnome/gdm-2.28.1/gdm.conf
index 559823b863..559823b863 100644
--- a/recipes/gnome/gdm-2.28.0/gdm.conf
+++ b/recipes/gnome/gdm-2.28.1/gdm.conf
diff --git a/recipes/gnome/gdm-2.28.0/other b/recipes/gnome/gdm-2.28.1/other
index 1fe5756178..1fe5756178 100644
--- a/recipes/gnome/gdm-2.28.0/other
+++ b/recipes/gnome/gdm-2.28.1/other
diff --git a/recipes/gnome/gdm_2.28.0.bb b/recipes/gnome/gdm_2.28.1.bb
index 1fc5e74f73..ef3b9f411a 100644
--- a/recipes/gnome/gdm_2.28.0.bb
+++ b/recipes/gnome/gdm_2.28.1.bb
@@ -3,8 +3,6 @@ LICENSE = "GPL"
 
 DEPENDS = "tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl xrdb"
 
-PR = "r3"
-
 inherit gnome update-rc.d
 
 RDEPENDS_${PN} += "grep"
@@ -25,14 +23,19 @@ EXTRA_OECONF = " --enable-authentication-scheme=shadow \
 
 do_install_prepend() {
 	mkdir -p ${D}/var/lib/gdm/.gconf.mandatory
-	cp ${WORKDIR}/%gconf-tree.xml ${D}/var/lib/gdm/.gconf.mandatory/ 
+	cp ${WORKDIR}/%gconf-tree.xml ${D}/var/lib/gdm/.gconf.mandatory/
+}
 
+do_install_append() {
 	install -d ${D}/${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/gdm ${D}/${sysconfdir}/init.d/
 
 	install -d ${D}/${sysconfdir}/gdm
 	install -m 0644 ${WORKDIR}/gdm.conf ${D}/${sysconfdir}/gdm/
 
+	install -d ${D}/${sysconfdir}/gdm/PreSession
+	install -m 0755 ${WORKDIR}/Default ${D}/${sysconfdir}/gdm/PreSession
+
 	install -d ${D}/${sysconfdir}/pam.d
 	install -m 0755 ${WORKDIR}/gdm-pam       ${D}/${sysconfdir}/pam.d/gdm
 	install -m 0755 ${WORKDIR}/other         ${D}/${sysconfdir}/pam.d/
diff --git a/recipes/gnome/gnome-system-monitor_2.28.0.bb b/recipes/gnome/gnome-system-monitor_2.28.0.bb
index c4eeaaa42d..13f6732cd7 100644
--- a/recipes/gnome/gnome-system-monitor_2.28.0.bb
+++ b/recipes/gnome/gnome-system-monitor_2.28.0.bb
@@ -20,6 +20,6 @@ FILES_${PN} += "${datadir}/icons \
 		${datadir}/gnome/autostart \
 		"
 
-FILE_{PN}-doc += "${datadir}/omf \
-                  ${datadir}/gnome/help "
+FILES_${PN}-doc += "${datadir}/omf \
+                    ${datadir}/gnome/help "
 
diff --git a/recipes/gnome/system-tools-backends_2.6.1.bb b/recipes/gnome/system-tools-backends_2.6.1.bb
index 23ccb240b9..08086188be 100644
--- a/recipes/gnome/system-tools-backends_2.6.1.bb
+++ b/recipes/gnome/system-tools-backends_2.6.1.bb
@@ -33,5 +33,4 @@ FILES_${PN} += " ${libdir}/pkgconfig"
 FILES_${PN} += " ${datadir}/dbus-1/system-services"
 FILES_${PN} += " ${datadir}/system-tools-backends-2.0/files"
 FILES_${PN} += " ${datadir}/system-tools-backends-2.0/scripts"
-FILES_${PN} += " ${datadir}/system-tools-backends-2.0/modules"
 
diff --git a/recipes/totem/totem_2.28.1.bb b/recipes/totem/totem_2.28.1.bb
index 35b077c025..a61f27ef76 100644
--- a/recipes/totem/totem_2.28.1.bb
+++ b/recipes/totem/totem_2.28.1.bb
@@ -6,6 +6,8 @@ DESCRIPTION = "A GTK2 based media player"
 HOMEPAGE = "http://www.gnome.org/projects/totem/"
 LICENSE = "GPL"
 
+PR = "r1"
+
 DEPENDS = " libgdata totem-pl-parser gtk+ dbus bluez-libs libglade gconf libxml2 gst-ffmpeg gst-plugins-bad  gst-plugins-base" 
 RDEPENDS_${PN} += "iso-codes"
 RRECOMMENDS_${PN} += "gst-plugin-playbin \
@@ -40,7 +42,6 @@ EXTRA_OECONF=" --disable-schemas-install \
                --enable-gstreamer \
                --enable-browser-plugins \
 	       --disable-run-in-source-tree \
-	       --disable-python \
 	       --disable-vala \
 	       --with-dbus \
 	       "