gdm: move to 2.28.2, fix conflict with libpam-base-files

8 files changed, 2 insertions, 21 deletions

diff --git a/recipes/gnome/gdm-2.28.1/other b/recipes/gnome/gdm-2.28.1/other
deleted file mode 100644
index 1fe5756178..0000000000
--- a/recipes/gnome/gdm-2.28.1/other
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# /etc/pam.d/other - specify the PAM fallback behaviour
-#
-# Note that this file is used for any unspecified service; for example
-#if /etc/pam.d/cron  specifies no session modules but cron calls
-#pam_open_session, the session module out of /etc/pam.d/other is
-#used.  If you really want nothing to happen then use pam_permit.so or
-#pam_deny.so as appropriate.
-
-#
-# default; standard UN*X access
-#
-auth     required       pam_unix.so
-account  required       pam_unix.so
-password required       pam_unix.so
-session  required       pam_unix.so
-
diff --git a/recipes/gnome/gdm-2.28.1/%gconf-tree.xml b/recipes/gnome/gdm-2.28.2/%gconf-tree.xml
index f8c2e9cc20..f8c2e9cc20 100644
--- a/recipes/gnome/gdm-2.28.1/%gconf-tree.xml
+++ b/recipes/gnome/gdm-2.28.2/%gconf-tree.xml
diff --git a/recipes/gnome/gdm-2.28.1/cross-xdetection.diff b/recipes/gnome/gdm-2.28.2/cross-xdetection.diff
index 150f79763a..150f79763a 100644
--- a/recipes/gnome/gdm-2.28.1/cross-xdetection.diff
+++ b/recipes/gnome/gdm-2.28.2/cross-xdetection.diff
diff --git a/recipes/gnome/gdm-2.28.1/gdm b/recipes/gnome/gdm-2.28.2/gdm
index 43eae95177..43eae95177 100755
--- a/recipes/gnome/gdm-2.28.1/gdm
+++ b/recipes/gnome/gdm-2.28.2/gdm
diff --git a/recipes/gnome/gdm-2.28.1/gdm-nodocs.patch b/recipes/gnome/gdm-2.28.2/gdm-nodocs.patch
index 395fa627eb..395fa627eb 100644
--- a/recipes/gnome/gdm-2.28.1/gdm-nodocs.patch
+++ b/recipes/gnome/gdm-2.28.2/gdm-nodocs.patch
diff --git a/recipes/gnome/gdm-2.28.1/gdm-pam b/recipes/gnome/gdm-2.28.2/gdm-pam
index f9fafed9d6..f9fafed9d6 100644
--- a/recipes/gnome/gdm-2.28.1/gdm-pam
+++ b/recipes/gnome/gdm-2.28.2/gdm-pam
diff --git a/recipes/gnome/gdm-2.28.1/gdm.conf b/recipes/gnome/gdm-2.28.2/gdm.conf
index 559823b863..559823b863 100644
--- a/recipes/gnome/gdm-2.28.1/gdm.conf
+++ b/recipes/gnome/gdm-2.28.2/gdm.conf
diff --git a/recipes/gnome/gdm_2.28.1.bb b/recipes/gnome/gdm_2.28.2.bb
index 91a5555c7a..a0a916b59f 100644
--- a/recipes/gnome/gdm_2.28.1.bb
+++ b/recipes/gnome/gdm_2.28.2.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "Graphical login manager"
 LICENSE = "GPL"
 
-DEPENDS = "tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl xrdb"
+DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl xrdb"
 
 inherit gnome update-rc.d
 
-RDEPENDS_${PN} += "grep"
+RDEPENDS_${PN} += "grep dbus-x11 shadow libpam-base-files"
 
 SRC_URI += " \
             file://cross-xdetection.diff;patch=1 \
@@ -13,7 +13,6 @@ SRC_URI += " \
             file://gdm \
             file://gdm.conf \
             file://gdm-pam \
-            file://other \
            "
 
 EXTRA_OECONF = " --enable-authentication-scheme=shadow \
@@ -35,7 +34,6 @@ do_install_append() {
 
 	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/
 }
 
 FILES_${PN} += "${datadir}/icon* \