[SCM] sddm packaging branch, kubuntu_unstable, updated. 0440ba159b007e41dee1ba3b69789481cba0467c

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_unstable branch:
commit a40cf0362c6f1082e36eeacdbce6c956c92608d6
Merge: 3f1cd1d1bdec5e8160ab69fcd973f43dad1cdb89 c5b91854dd623f0134f596374d797cc115dca636
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Oct 17 15:44:44 2014 +0200

    merge with debian

 debian/.gitattributes |  1 +
 debian/TODO           | 13 ++++++++++
 debian/changelog      |  4 ---
 debian/sddm.config    | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/watch          |  4 +--
 5 files changed, 87 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 950eb37,5913710..d7d36e7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,40 -1,9 +1,36 @@@
 -sddm (0.10.0-1~) UNRELEASED; urgency=medium
 +sddm (0.9.0-0ubuntu1~ubuntu14.10~ppa12) utopic; urgency=medium
  
 -  [ Michał Zając ]
 -  * Initial release (LP: #1157742)
 +  * Merge with Debian git pacakging, remaining changes:
 +   - upstream_xsession-scripts.diff
 +   - upstream_fix-xsession-for-zsh.diff
 +   - Build with -DNO_SYSTEMD=true in debian/rules
 +   - sddm.install don't install systemd file
  
 -  [ Maximiliano Curia ]
 -  * New upstream release (0.10.0).
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 17 Oct 2014 11:02:18 +0200
  
 - -- Maximiliano Curia <maxy at debian.org>  Fri, 17 Oct 2014 13:00:29 +0200
 +sddm (0.9.0-0ubuntu1~ubuntu14.10~ppa11) utopic; urgency=medium
 +
 +  * Add upstream_fix-xsession-for-zsh.diff to fix login with zsh
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 10 Oct 2014 11:54:17 +0200
 +
 +sddm (0.9.0-0ubuntu1~ubuntu14.10~ppa10) utopic; urgency=medium
 +
 +  * Add upstream_xsession-scripts.diff from
 +    https://github.com/krf/sddm/commit/47861f90a1cf3b28990e6ffb2d89f43217d0dcbe
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 09 Oct 2014 17:29:53 +0200
 +
 +sddm (0.9.0-0ubuntu1~ubuntu14.10~ppa9) utopic; urgency=medium
 +
 +  * Build with -DNO_SYSTEMD=true to see if that helps logging
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 30 Sep 2014 14:59:23 +0200
 +
 +sddm (0.9.0-0ubuntu1~ubuntu14.10~ppa8) utopic; urgency=medium
 +
 +  * Add kubuntu_minimumvt.diff Changed the MINIMUMVT to 7 (LP: #1362599)
 +
 + -- Denis Meiswinkel <denis.meiswinkel at gmail.com>  Mon, 29 Sep 2014 11:50:50 +0000
 +
 +sddm (0.9.0-0ubuntu1~ubuntu14.10~ppa7) utopic; urgency=low
- 
-   * Initial release (LP: #1157742)
- 
-  -- Michał Zając <quintasan at kubuntu.org>  Tue, 22 Apr 2014 16:50:04 +0100

-- 
sddm packaging