[SCM] sddm packaging branch, kubuntu_unstable, updated. 72ee6abd6aea98c45fe1b8b0626a67bef9e70353

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 72ee6abd6aea98c45fe1b8b0626a67bef9e70353
Merge: 6a1726beec8dd7539a29fc70a943f9bd14110a46 79e329337a63cac892a2ed7216a6859dd2e71171
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Aug 24 12:53:53 2015 +0200

    Merge branch 'kubuntu_wily_archive' into kubuntu_unstable
    
    Conflicts:
    	debian/patches/series

 debian/changelog                                |  23 +++++
 debian/copyright                                |  14 ++-
 debian/patches/kubuntu_nvidia-prime-logout.diff | 108 ++++++++++++++++++++++++
 debian/patches/kubuntu_nvidia-prime.diff        |  14 ++-
 debian/patches/series                           |   1 +
 debian/sddm.pam                                 |   2 +
 debian/sddm.postinst                            |  28 +++---
 7 files changed, 171 insertions(+), 19 deletions(-)

diff --cc debian/patches/series
index 09ee196,998ed45..dafab66
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,7 +1,5 @@@
  kubuntu_use_breeze.diff
 -kubuntu_dbus-config-rename.diff
  kubuntu_minimum_vt.diff
  upstream_add-graphical.target.diff
 -upstream_fix-zsh-Xsession.patch
+ kubuntu_nvidia-prime-logout.diff
  kubuntu_nvidia-prime.diff

-- 
sddm packaging