[arch-commits] Commit in gdm/trunk (4 files)

[Ionut Biru]

    Date: Wednesday, October 19, 2011 @ 03:50:32
  Author: ibiru
Revision: 140779

update to 3.2.1

Modified:
  gdm/trunk/PKGBUILD
  gdm/trunk/gdm-password.pam
  gdm/trunk/gdm.install
Deleted:
  gdm/trunk/check-for-shell.patch

-----------------------+
 PKGBUILD              |   15 ++++++---------
 check-for-shell.patch |   26 --------------------------
 gdm-password.pam      |    2 +-
 gdm.install           |    2 ++
 4 files changed, 9 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-10-19 07:11:57 UTC (rev 140778)
+++ PKGBUILD	2011-10-19 07:50:32 UTC (rev 140779)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gdm
-pkgver=3.2.0
-pkgrel=2
+pkgver=3.2.1
+pkgrel=1
 pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -20,23 +20,20 @@
         fix_external_program_directories.patch
         gdm-vt-allocation-hack.patch
         gdm
-        gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam
-        check-for-shell.patch::http://git.gnome.org/browse/gdm/patch/?id=64e6b10f98fe7226a2f41807268dae3afa80236d)
-sha256sums=('f827f5500827acef94ad2d60f02ec489bc35cb6392d8f4a60ec814599c2991b7'
+        gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam)
+sha256sums=('f98d00819d05185b20bd03c02f7b97ca63a63cab110b94fadfe8f58d4d4475f0'
             '2014ae3a6077546f7c07e80a6acc8a1c80c6765ad319ec389f52500c5a4fb363'
             '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215'
             '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550'
             'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d'
             '5bc3ff3ea7b31219dfcb7d9fc0eb2819eca1c5573a0f426d288a17560a69633e'
             'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
-            '0dbb37b4e2a2a2dd2305f0f69cf32d63d353d34aacaf805d2c2ec52fbe558bb4'
+            '92aded0804bad8a609fd150448ad4a2edb8166c17cb4e2b581559e80603bbb6c'
             'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd'
-            '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834'
-            'ae54f11e593e97e031d2dd7b33ce9899038356cef87b354f3c4c596a3153155d')
+            '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/check-for-shell.patch"
   patch -Np1 -i "${srcdir}/fix_external_program_directories.patch"
   patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch"
 

Deleted: check-for-shell.patch
===================================================================
--- check-for-shell.patch	2011-10-19 07:11:57 UTC (rev 140778)
+++ check-for-shell.patch	2011-10-19 07:50:32 UTC (rev 140779)
@@ -1,26 +0,0 @@
-From 64e6b10f98fe7226a2f41807268dae3afa80236d Mon Sep 17 00:00:00 2001
-From: György Balló <ballogy at freestart.hu>
-Date: Fri, 30 Sep 2011 21:48:40 +0000
-Subject: data: add back check for gnome-shell before running gdm-shell session
-
-Add back commit 4892c9447324f2248ce944f150abe3143f78eaa3
-
-This commit does a quick check to make sure gnome-shell is
-installed, and supports --gdm-mode. If either of those fail,
-then fall back to the old greeter.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=660409
----
-diff --git a/data/gdm-shell.session.in b/data/gdm-shell.session.in
-index 3d408c3..496cc10 100644
---- a/data/gdm-shell.session.in
-+++ b/data/gdm-shell.session.in
-@@ -1,5 +1,5 @@
- [GNOME Session]
- Name=Display Manager
- RequiredComponents=gnome-shell;gnome-settings-daemon;
--IsRunnableHelper=@libexecdir@/gnome-session-check-accelerated
-+IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated'
- FallbackSession=gdm-fallback
---
-cgit v0.9.0.2

Modified: gdm-password.pam
===================================================================
--- gdm-password.pam	2011-10-19 07:11:57 UTC (rev 140778)
+++ gdm-password.pam	2011-10-19 07:50:32 UTC (rev 140779)
@@ -14,7 +14,7 @@
 
 session         required        pam_loginuid.so
 -session        optional        pam_systemd.so
-session         optional        pam_keyinit.so revoke
+session         optional        pam_keyinit.so force revoke
 session         required        pam_limits.so
 session         required        pam_unix.so
 session         optional        pam_gnome_keyring.so auto_start

Modified: gdm.install
===================================================================
--- gdm.install	2011-10-19 07:11:57 UTC (rev 140778)
+++ gdm.install	2011-10-19 07:50:32 UTC (rev 140779)
@@ -9,6 +9,7 @@
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   gconfpkg --install ${pkgname}
   glib-compile-schemas usr/share/glib-2.0/schemas
+  dconf update
 }
 
 pre_remove() {
@@ -23,6 +24,7 @@
 
 post_remove() {
   glib-compile-schemas usr/share/glib-2.0/schemas
+  dconf update
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   getent passwd gdm >/dev/null 2>&1 && userdel gdm
   getent group gdm >/dev/null 2>&1 && groupdel gdm