[SCM] sddm packaging branch, kubuntu_xenial_archive, updated. debian/0.13.0-1-13-gba3f080

Philip Muškovac yofel-guest at moszumanska.debian.org
Tue Jan 5 15:53:37 UTC 2016


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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 733f0f458eadf6245e825b873d1367ebc90f01a0
Merge: c194056875419dd063d3f7ebe837a4b622652a92 8886e69a1f71e566fc667116ad45745e3fa3476e
Author: Philip Muškovac <yofel at gmx.net>
Date:   Tue Jan 5 16:34:45 2016 +0100

    Merge with debian unstable

 debian/TODO                                        |   2 +-
 debian/Xsession                                    |  47 +++++
 debian/changelog                                   | 141 ++++++++++++++
 debian/control                                     |  22 ++-
 debian/copyright                                   | 214 ++++++++++-----------
 debian/patches/01_sddm_systemctl.diff              |  13 ++
 ..._use_breeze.diff => 02_kubuntu_use_breeze.diff} |   8 +-
 debian/patches/04_set_default_path.diff            |  34 ++++
 debian/patches/kubuntu_dbus-config-rename.diff     |  13 --
 debian/patches/series                              |   8 +-
 debian/patches/upstream_add-graphical.target.diff  |  17 --
 debian/po/af.po                                    |  13 +-
 debian/po/an.po                                    |  13 +-
 debian/po/ar.po                                    |  20 +-
 debian/po/ast.po                                   |  16 +-
 debian/po/az.po                                    |  13 +-
 debian/po/be.po                                    |  13 +-
 debian/po/bg.po                                    |  24 +--
 debian/po/bn.po                                    |  16 +-
 debian/po/bo.po                                    |  13 +-
 debian/po/br.po                                    |  13 +-
 debian/po/bs.po                                    |  20 +-
 debian/po/ca.po                                    | 103 +++++-----
 debian/po/ca at valencia.po                           |  16 +-
 debian/po/ckb.po                                   |  13 +-
 debian/po/cs.po                                    | 111 ++++++-----
 debian/po/cy.po                                    |  13 +-
 debian/po/da.po                                    |  90 ++++-----
 debian/po/de.po                                    | 117 ++++++-----
 debian/po/el.po                                    | 119 +++++++-----
 debian/po/en_AU.po                                 |  16 +-
 debian/po/en_CA.po                                 |  13 +-
 debian/po/en_GB.po                                 |  16 +-
 debian/po/eo.po                                    |  19 +-
 debian/po/es.po                                    | 113 ++++++-----
 debian/po/et.po                                    |  19 +-
 debian/po/eu.po                                    | 106 +++++-----
 debian/po/fa.po                                    |  13 +-
 debian/po/fi.po                                    |  94 ++++-----
 debian/po/fo.po                                    |  13 +-
 debian/po/fr.po                                    | 112 ++++++-----
 debian/po/fr_CA.po                                 |  13 +-
 debian/po/fy.po                                    |  13 +-
 debian/po/gd.po                                    |  16 +-
 debian/po/gl.po                                    |  89 ++++-----
 debian/po/gu.po                                    |  13 +-
 debian/po/he.po                                    |  16 +-
 debian/po/hi.po                                    |  13 +-
 debian/po/hr.po                                    |  16 +-
 debian/po/hu.po                                    |  19 +-
 debian/po/ia.po                                    |  16 +-
 debian/po/id.po                                    |  16 +-
 debian/po/is.po                                    |  13 +-
 debian/po/it.po                                    | 108 ++++++-----
 debian/po/ja.po                                    | 108 ++++++-----
 debian/po/kk.po                                    |  19 +-
 debian/po/kl.po                                    |  13 +-
 debian/po/km.po                                    |  13 +-
 debian/po/kn.po                                    |  13 +-
 debian/po/ko.po                                    |  82 ++++----
 debian/po/ku.po                                    |  16 +-
 debian/po/lb.po                                    |  20 +-
 debian/po/lt.po                                    |  16 +-
 debian/po/lv.po                                    |  13 +-
 debian/po/mhr.po                                   |  13 +-
 debian/po/mi.po                                    |  13 +-
 debian/po/ml.po                                    |  75 +++++---
 debian/po/mr.po                                    |  13 +-
 debian/po/ms.po                                    |  19 +-
 debian/po/my.po                                    |  13 +-
 debian/po/nb.po                                    |  16 +-
 debian/po/nl.po                                    | 120 ++++++------
 debian/po/nn.po                                    |  13 +-
 debian/po/oc.po                                    |  13 +-
 debian/po/pa.po                                    |  13 +-
 debian/po/pl.po                                    |  91 ++++-----
 debian/po/pt.po                                    |  88 ++++-----
 debian/po/pt_BR.po                                 | 109 ++++++-----
 debian/po/ro.po                                    | 109 ++++++-----
 debian/po/ru.po                                    | 106 +++++-----
 debian/po/sc.po                                    |  13 +-
 debian/po/sd.po                                    |  13 +-
 debian/po/shn.po                                   |  13 +-
 debian/po/si.po                                    |  13 +-
 debian/po/sk.po                                    |  87 +++++----
 debian/po/sl.po                                    |  19 +-
 debian/po/sq.po                                    |  20 +-
 debian/po/sr.po                                    |  24 +--
 debian/po/sv.po                                    | 109 ++++++-----
 debian/po/ta.po                                    |  82 ++++----
 debian/po/te.po                                    |  13 +-
 debian/po/templates.pot                            |  13 +-
 debian/po/tg.po                                    |  13 +-
 debian/po/th.po                                    |  19 +-
 debian/po/tl.po                                    |  13 +-
 debian/po/tr.po                                    | 128 ++++++------
 debian/po/ug.po                                    |  16 +-
 debian/po/uk.po                                    |  19 +-
 debian/po/uz.po                                    |  16 +-
 debian/po/vi.po                                    | 109 ++++++-----
 debian/po/wae.po                                   |  16 +-
 debian/po/zh_CN.po                                 | 101 +++++-----
 debian/po/zh_HK.po                                 |  16 +-
 debian/po/zh_TW.po                                 |  16 +-
 debian/rules                                       |  27 ++-
 debian/sddm.config                                 |  11 +-
 debian/sddm.init                                   |   6 +-
 debian/sddm.install                                |   6 +-
 debian/sddm.pam                                    |   4 +-
 debian/sddm.postinst                               |  13 +-
 debian/sddm.postrm                                 |   4 +-
 debian/sddm.prerm                                  |   7 +-
 debian/sddm.sddm-autologin.pam                     |   1 +
 debian/sddm.sddm-greeter.pam                       |   1 +
 debian/sddm.service                                |  20 ++
 debian/watch                                       |   2 +-
 116 files changed, 2480 insertions(+), 1830 deletions(-)

diff --cc debian/changelog
index 50f1b6f,d3a59fc..d47d8cb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,53 -1,131 +1,193 @@@
++sddm (0.13.0-1ubuntu1) UNRELEASED; urgency=medium
++
++  * Merge with debian unstable, remaining changes: 
++    - keep the default-display-manager file logic in sddm.postinst
++    - keep kubuntu specific patches:
++      + kubuntu_nvidia-prime-logout.diff
++      + kubuntu_nvidia-prime.diff
++      + use-systemd.patch
++      + kubuntu_minimum_vt.diff instead of 03_vt7-minimum-vt.diff
++
++ -- Philip Muškovac <yofel at kubuntu.org>  Tue, 05 Jan 2016 16:15:05 +0100
++
+ sddm (0.13.0-1) unstable; urgency=medium
+ 
+   * Team Upload
+   [ Diane Trout ]
+   * New upstream release.
+   * Remove CVE-2015-0856.patch applied upstream.
+   * Refresh patches.
+   * Build man pages
+     - Add python-docutils to Build-Depends
+     - Add built man pages to sddm.install
+ 
+   [ Scott Kitterman ]
+   * Add missing debian/changelog entry from previous revision
+   * Apply sddm.pam.diff (provided by Alf Gaida - Thanks!) and add
+     libpam-systemd to sddm Recommends to fix session problems while using
+     systemd while still allowing non-systemd installations (Closes: #799837,
+     #806758)
+ 
+  -- Diane Trout <diane at ghic.org>  Mon, 04 Jan 2016 22:23:34 -0800
+ 
+ sddm (0.12.0-5) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Maximiliano Curia ]
+   * Delete the sddm.log file on purge. (Closes: #793679)
+   * The themes shipped with sddm need the latest version, using breaks
+     instead of depends to avoid circular deps. (Closes: #800462) Thanks
+     to Max Görner
+ 
+   [ Matthias Klumpp ]
+   * Fix deadlock in sddm.service when waiting for Plymouth to quit
+ 
+   [ Scott Kitterman ]
+   * Add debian/patches/CVE-2015-0856.patch to fix potential issue if an SDDM
+     theme crashes while running the KDE debug handler (Closes: #803338)
+ 
+  -- Scott Kitterman <scott at kitterman.com>  Thu, 29 Oct 2015 00:01:45 -0400
+ 
+ sddm (0.12.0-4) unstable; urgency=medium
+ 
+   * Fix indep build. (Closes: #799142) Thanks to Boris Pek
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Sep 2015 15:06:00 +0200
+ 
+ sddm (0.12.0-3) unstable; urgency=medium
+ 
+   * Update service file, run after plymouth-quit-wait.
+   * Re add patch: 04_set_default_path.diff
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 14 Sep 2015 21:22:30 +0200
+ 
+ sddm (0.12.0-2) unstable; urgency=medium
+ 
+   * Team upload
+   * Ensure SDDM waits for Plymouth and getty to quit before starting
+     (Closes: #793637)
+   * Drop some unnecessary patches
+   * Suggest libpam-kwallet5 instead of pam-kwallet5
+ 
+  -- Matthias Klumpp <mak at debian.org>  Sat, 12 Sep 2015 16:32:50 +0200
+ 
+ sddm (0.12.0-1) unstable; urgency=medium
+ 
+   * Team upload
+   * New upstream release: 0.12.0
+   * Drop patches which are applied upstream
+   * Refresh and reorganize remaining patches
+   * debian/rules: Compile with DBUS_CONFIG_FILENAME set to non-conflicting name
+   * Ensure Xsession script is marked as executable
+   * Don't fail when purging sddm
+ 
+  -- Matthias Klumpp <mak at debian.org>  Sat, 05 Sep 2015 22:02:54 +0200
+ 
+ sddm (0.11.0-4) unstable; urgency=medium
+ 
+   [ Scott Kitterman ]
+   * Team upload.
+   * Add Provides: x-display-manager for sddm (Closes: 795006)
+ 
+   [ Maximiliano Curia ]
+   * Add the Xsession script. (Closes: #794419)
+   * New patch: default_path
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 03 Sep 2015 17:23:08 +0200
+ 
+ sddm (0.11.0-3) unstable; urgency=medium
+ 
+   * Transition to libsystemd-dev. (Closes: #792400) Thanks to Michael
+     Biebl
+   * New patch: libsystemd.diff
+   * Fix systemctl path. (Closes: #792401) Thanks to Michael Biebl
+   * New patch: sddm_systemctl.diff
+   * Update debian/po files. (Closes: #792085) Thanks to Christian
+     Perrier
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 18 Jul 2015 21:34:44 +0200
+ 
+ sddm (0.11.0-2) unstable; 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:
+     - limit the libsystemd-login-dev build dependency as linux-any
+     - properly use DEB_HOST_ARCH_OS for detecting the current target OS
+     - explicitly disable systemd and journald on non-Linux archs
+     - disable installation of the upstream lib/systemd/system/sddm.service
+       (installed only with systemd support enabled), as there is a local
+       debian/sddm.service which will be used anyway instead
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 09 Jul 2015 15:20:08 +0200
+ 
+ sddm (0.11.0-1) experimental; urgency=medium
+ 
+   [ Michał Zając ]
+   * Initial release (LP: #1157742)
+ 
+   [ Maximiliano Curia ]
+   * New upstream release (0.10.0).
+   * New upstream release (0.11.0).
+   * Update copyright information.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 27 Mar 2015 21:27:38 +0100
+ 
 +sddm (0.11.0-0ubuntu12) xenial; urgency=high
 +
 +  * Replace libsystemd-login-dev with libsystemd-dev.
 +
 + -- Dimitri John Ledkov <xnox at ubuntu.com>  Mon, 04 Jan 2016 14:25:10 +0000
 +
 +sddm (0.11.0-0ubuntu11) wily; urgency=medium
 +
 +  * Fix postrm to remove what was if'd for as to avoid failure.
 +  * Add pam_kwallet5 to the pam profile rules. It is the same version as
 +    pam_kwallet but for kwallet5 (kwallet4 and kwallet5 are distinct entities
 +    requiring separate unlocking)
 +
 + -- Harald Sitter <sitter at kde.org>  Mon, 24 Aug 2015 12:40:32 +0200
 +
 +sddm (0.11.0-0ubuntu10) vivid; urgency=medium
 +
 +  * Add kubuntu_nvidia-prime-logout.diff from Alberto to run a script on
 +    logout
 +  * In kubuntu_nvidia-prime.diff run nvidia-switch on logout
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 10 Apr 2015 21:31:06 +0200
 +
 +sddm (0.11.0-0ubuntu9) vivid; urgency=medium
 +
 +  * Update sddm.postinst to create /etc/X11/default-display-manager
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 08 Apr 2015 21:48:55 +0200
 +
 +sddm (0.11.0-0ubuntu8) vivid; urgency=medium
 +
 +  * Add upstream_fix-zsh-Xsession.patch: fix Xsession with zsh from
 +    upstream. LP: #1439826
 +
 + -- Dan McGregor <dan.mcgregor at usask.ca>  Thu, 02 Apr 2015 11:26:39 -0600
 +
 +sddm (0.11.0-0ubuntu7) vivid; urgency=medium
 +
 +  * Add kubuntu_nvidia-prime.diff to run nvidia-prime setup script at
 +    login
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 02 Apr 2015 16:07:55 +0200
 +
 +sddm (0.11.0-0ubuntu6) vivid; urgency=medium
 +
 +  * In kubuntu_minimum_vt.diff remove conflicts on tty1 in systemd
 +    sddm.service
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 31 Mar 2015 16:37:15 +0200
 +
  sddm (0.11.0-0ubuntu5) vivid; urgency=medium
  
    * Add upstream_add-graphical.target.diff from upstream
@@@ -86,3 -164,3 +226,4 @@@ sddm (0.10.0+dfsg1-0ubuntu1) vivid; urg
      image, https://github.com/sddm/sddm/issues/315
  
   -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 17 Oct 2014 15:39:42 +0200
++
diff --cc debian/patches/series
index c9d29f0,eb3a11c..0dd7760
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,4 +1,8 @@@
- kubuntu_use_breeze.diff
- kubuntu_dbus-config-rename.diff
+ 01_sddm_systemctl.diff
+ 02_kubuntu_use_breeze.diff
 -03_vt7-minimum-vt.diff
+ 04_set_default_path.diff
++
 +kubuntu_minimum_vt.diff
- upstream_add-graphical.target.diff
- upstream_fix-zsh-Xsession.patch
 +kubuntu_nvidia-prime-logout.diff
 +kubuntu_nvidia-prime.diff
 +use-systemd.patch

-- 
sddm packaging



More information about the pkg-kde-commits mailing list