[SCM] sddm packaging branch, master, updated. debian/0.11.0-1-6-g920c61c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/sddm.git;a=commitdiff;h=c7cce0f

The following commit has been merged in the master branch:
commit c7cce0f9b40c53a762851285aee0695e8434d091
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jul 9 15:06:14 2015 +0200

    Re-enable libpam-gnome-keyring.
---
 debian/changelog | 1 +
 debian/sddm.pam  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e5f654f..368a062 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ sddm (0.11.0-2~) UNRELEASED; urgency=medium
   [ Maximiliano Curia ]
   * Re-enable patches kubuntu_use_breeze.diff, kubuntu_minimum_vt.diff,
     upstream_add-graphical.target.diff.
+  * Re-enable libpam-gnome-keyring.
 
   [ Pino Toscano ]
   * Make sddm build on non-Linux architectures:
diff --git a/debian/sddm.pam b/debian/sddm.pam
index a1607be..e6494c2 100644
--- a/debian/sddm.pam
+++ b/debian/sddm.pam
@@ -7,7 +7,7 @@ auth    required        pam_succeed_if.so user != root quiet_success
 # auth    sufficient      pam_succeed_if.so user ingroup nopasswdlogin
 @include common-auth
 # gnome_keyring breaks QProcess
-# -auth   optional        pam_gnome_keyring.so
+-auth   optional        pam_gnome_keyring.so
 -auth   optional        pam_kwallet.so
 
 @include common-account
@@ -25,7 +25,7 @@ session required        pam_loginuid.so
 # in the proper default security context.  Only sessions which are intended
 # to run in the user's context should be run after this.
 session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
-# -session optional       pam_gnome_keyring.so auto_start
+-session optional       pam_gnome_keyring.so auto_start
 -session optional       pam_kwallet.so auto_start
 
 @include common-password

-- 
sddm packaging