[SCM] sddm packaging branch, master, updated. debian/0.13.0-1-64-geaa5f0b

[Simon Quigley]

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

The following commit has been merged in the master branch:
commit eaa5f0b70926ad8ffbc5aeecb8ee215e36da80a9
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Sun Nov 26 14:34:14 2017 -0600

    Upstream changes from Kubuntu so a very minimal delta can be kept.
---
 debian/changelog                          |  2 ++
 debian/conffiles                          |  4 ++++
 debian/patches/04_set_default_path.diff   | 40 +++++++++++++++++++++++++++++++
 debian/patches/06_nvidia_prime_setup.diff | 33 +++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 5 files changed, 80 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f745e2f..4f3f5b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ sddm (0.16.0-1) UNRELEASED; urgency=medium
 
   [ Simon Quigley ]
   * Bump Standards-version to 4.1.1, no changes needed.
+  * Upstream patch from Kubuntu which allows for NVIDIA Prime to be setup on
+    login.
 
  -- Simon Quigley <tsimonq2 at ubuntu.com>  Sun, 26 Nov 2017 12:16:08 -0600
 
diff --git a/debian/conffiles b/debian/conffiles
new file mode 100644
index 0000000..1d1deed
--- /dev/null
+++ b/debian/conffiles
@@ -0,0 +1,4 @@
+usr/share/sddm/scripts/Xsetup
+usr/share/sddm/scripts/Xsession
+usr/share/sddm/scripts/Xstop
+usr/share/sddm/scripts/wayland-session
diff --git a/debian/patches/04_set_default_path.diff b/debian/patches/04_set_default_path.diff
new file mode 100644
index 0000000..3755fe6
--- /dev/null
+++ b/debian/patches/04_set_default_path.diff
@@ -0,0 +1,40 @@
+From: Maximiliano Curia <maxy at debian.org>
+Date: Fri, 11 Nov 2016 09:45:34 +0100
+Subject: Change the default PATH
+
+The configured default PATH is used in the parts that run as root, the
+greeter and for the user  sessions, so its better to have an spartan default.
+
+At the same time, for the zsh users this spartan version gets expanded thanks
+to the default global zshenv, while exporting a different value in the
+Xsession script would be overriding the users configurations in their local
+zshenv.
+Forwarded: not-needed
+Last-Update: 2015-09-14
+---
+ data/man/sddm.conf.rst.in  | 2 +-
+ src/common/Configuration.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/data/man/sddm.conf.rst.in
++++ b/data/man/sddm.conf.rst.in
+@@ -156,7 +156,7 @@
+ 
+ `DefaultPath=`
+ 	Default path to set after successfully logging in.
+-	Default value is "/bin:/usr/bin:/usr/local/bin".
++	Default value is "/bin:/usr/bin".
+ 
+ `MinimumUid=`
+ 	Minimum user id of the users to be listed in the
+--- a/src/common/Configuration.h
++++ b/src/common/Configuration.h
+@@ -80,7 +80,7 @@
+         );
+ 
+         Section(Users,
+-            Entry(DefaultPath,         QString,     _S("/bin:/usr/bin:/usr/local/bin"),         _S("Default $PATH for logged in users"));
++            Entry(DefaultPath,         QString,     _S("/bin:/usr/bin"),                        _S("Default $PATH for logged in users"));
+             Entry(MinimumUid,          int,         UID_MIN,                                    _S("Minimum user id for displayed users"));
+             Entry(MaximumUid,          int,         UID_MAX,                                    _S("Maximum user id for displayed users"));
+             Entry(HideUsers,           QStringList, QStringList(),                              _S("Comma-separated list of users that should not be listed"));
diff --git a/debian/patches/06_nvidia_prime_setup.diff b/debian/patches/06_nvidia_prime_setup.diff
new file mode 100644
index 0000000..edbe48d
--- /dev/null
+++ b/debian/patches/06_nvidia_prime_setup.diff
@@ -0,0 +1,33 @@
+Description: run nvidia-prime setup on login
+Author: Jonathan Riddell <jriddell at ubuntu.com>
+Origin: me
+Bug: https://bugs.launchpad.net/ubuntu/+source/nvidia-prime/+bug/1428328
+Bug-SDDM: https://github.com/sddm/sddm/issues/393
+Forwarded: yes, although it's not very elegant so may not be accepted
+Last-Update: 2015-04-02
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: sddm-0.11.0/data/scripts/Xsetup
+===================================================================
+--- sddm-0.11.0.orig/data/scripts/Xsetup
++++ sddm-0.11.0/data/scripts/Xsetup
+@@ -1,3 +1,7 @@
+ #!/bin/sh
+ # Xsetup - run as root before the login dialog appears
+ 
++if [ -e /sbin/prime-offload ]; then
++    echo running NVIDIA Prime setup /sbin/prime-offload
++    /sbin/prime-offload
++fi
+Index: sddm-0.11.0/data/scripts/Xstop
+===================================================================
+--- sddm-0.11.0.orig/data/scripts/Xstop
++++ sddm-0.11.0/data/scripts/Xstop
+@@ -1,2 +1,7 @@
+ #!/bin/sh
+ # Xstop - run as root after stopping X
++
++if [ -e /sbin/prime-switch ]; then
++    echo running NVIDIA Prime switch /sbin/prime-switch
++    /sbin/prime-switch
++fi
diff --git a/debian/patches/series b/debian/patches/series
index 29b0efc..fbaee48 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 01_sddm_systemctl.diff
 02_use_debian_theme.diff
 03_vt7-minimum-vt.diff
+04_set_default_path.diff
 05_add_debian_themes.diff
 handle-reading-from-a-closed-file-handle.patch

-- 
sddm packaging