[SCM] sddm packaging branch, kubuntu_xenial_archive, updated. ubuntu/0.13.0-1ubuntu4

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 50851f8e3831f79e1717d08096a172f10e1db484
Author: Philip Muškovac <yofel at gmx.net>
Date:   Sun Jan 10 15:50:00 2016 +0100

    Restore kwallet4 auto-start that was dropped in the debian merge
---
 debian/changelog | 1 +
 debian/sddm.pam  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c06f142..ec21dca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ sddm (0.13.0-1ubuntu4) UNRELEASED; urgency=medium
 
   * Switch the watch file back to gz as xz lookup on GitHub isn't really
     possible 
+  * Restore kwallet4 auto-start that was dropped in the debian merge
 
  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 10 Jan 2016 15:40:55 +0100
 
diff --git a/debian/sddm.pam b/debian/sddm.pam
index b40c6e5..2e17511 100644
--- a/debian/sddm.pam
+++ b/debian/sddm.pam
@@ -8,6 +8,7 @@ auth    required        pam_succeed_if.so user != root quiet_success
 @include common-auth
 # gnome_keyring breaks QProcess
 -auth   optional        pam_gnome_keyring.so
+-auth   optional        pam_kwallet.so
 -auth   optional        pam_kwallet5.so
 
 @include common-account
@@ -27,6 +28,7 @@ session required        pam_systemd.so
 # 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_kwallet.so auto_start
 -session optional       pam_kwallet5.so auto_start
 
 @include common-password

-- 
sddm packaging