r13556 - in /desktop/unstable/gdm/debian: changelog control control.in gdm.pam

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Nov 25 10:40:39 2007
New Revision: 13556

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13556
Log:
* gdm.pam: add support for pam_gnome_keyring. Closes: #445870.
* Suggest libpam-gnome-keyring.

Modified:
    desktop/unstable/gdm/debian/changelog
    desktop/unstable/gdm/debian/control
    desktop/unstable/gdm/debian/control.in
    desktop/unstable/gdm/debian/gdm.pam

Modified: desktop/unstable/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/changelog?rev=13556&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog (original)
+++ desktop/unstable/gdm/debian/changelog Sun Nov 25 10:40:39 2007
@@ -5,8 +5,10 @@
       /etc/X11/default-display-manager, to allow the user to specify a 
       path by hand. Closes: #452344.
     + Fix bashims.
-
- -- Josselin Mouette <joss at debian.org>  Fri, 23 Nov 2007 12:26:36 +0100
+  * gdm.pam: add support for pam_gnome_keyring. Closes: #445870.
+  * Suggest libpam-gnome-keyring.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 25 Nov 2007 11:32:50 +0100
 
 gdm (2.20.1-2) unstable; urgency=low
 

Modified: desktop/unstable/gdm/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/control?rev=13556&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/control (original)
+++ desktop/unstable/gdm/debian/control Sun Nov 25 10:40:39 2007
@@ -51,7 +51,8 @@
             xserver-xephyr | xnest,
             xserver-xorg
 Suggests: locales,
-          uswsusp
+          uswsusp,
+          libpam-gnome-keyring
 Provides: x-display-manager
 Conflicts: fast-user-switch-applet (<< 2.17.4),
            gnome-session (<< 2.19.2),

Modified: desktop/unstable/gdm/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/control.in?rev=13556&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/control.in (original)
+++ desktop/unstable/gdm/debian/control.in Sun Nov 25 10:40:39 2007
@@ -51,7 +51,8 @@
             xserver-xephyr | xnest,
             xserver-xorg
 Suggests: locales,
-          uswsusp
+          uswsusp,
+          libpam-gnome-keyring
 Provides: x-display-manager
 Conflicts: fast-user-switch-applet (<< 2.17.4),
            gnome-session (<< 2.19.2),

Modified: desktop/unstable/gdm/debian/gdm.pam
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/gdm.pam?rev=13556&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/gdm.pam (original)
+++ desktop/unstable/gdm/debian/gdm.pam Sun Nov 25 10:40:39 2007
@@ -3,7 +3,9 @@
 auth    required        pam_env.so readenv=1
 auth    required        pam_env.so readenv=1 envfile=/etc/default/locale
 @include common-auth
+auth    optional        pam_gnome_keyring.so
 @include common-account
 session required        pam_limits.so
 @include common-session
+session optional        pam_gnome_keyring.so auto_start
 @include common-password