[SCM] sddm packaging branch, kubuntu_vivid_archive, updated. c0cb8c825ff84eeece14e6305b99ea79a4168cb2

[Harald Sitter]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit c0cb8c825ff84eeece14e6305b99ea79a4168cb2
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Apr 7 17:50:26 2015 +0200

    sync with archive
---
 debian/changelog                               | 21 +++++++++++++++++++++
 debian/patches/kubuntu_minimum_vt.diff         | 12 ++++++++++++
 debian/patches/kubuntu_nvidia-prime.diff       | 21 +++++++++++++++++++++
 debian/patches/series                          |  2 ++
 debian/patches/upstream_fix-zsh-Xsession.patch | 23 +++++++++++++++++++++++
 5 files changed, 79 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b97c328..adea8f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+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
diff --git a/debian/patches/kubuntu_minimum_vt.diff b/debian/patches/kubuntu_minimum_vt.diff
index 9052c98..5182646 100644
--- a/debian/patches/kubuntu_minimum_vt.diff
+++ b/debian/patches/kubuntu_minimum_vt.diff
@@ -18,3 +18,15 @@ Index: sddm-0.11.0/CMakeLists.txt
      set(HALT_COMMAND "/usr/bin/systemctl poweroff")
      set(REBOOT_COMMAND "/usr/bin/systemctl reboot")
  else()
+Index: sddm-0.11.0/services/sddm.service.in
+===================================================================
+--- sddm-0.11.0.orig/services/sddm.service.in
++++ sddm-0.11.0/services/sddm.service.in
+@@ -1,7 +1,6 @@
+ [Unit]
+ Description=Simple Desktop Display Manager
+ Documentation=man:sddm(1) man:sddm.conf(5)
+-Conflicts=getty at tty1.service
+ After=systemd-user-sessions.service getty at tty1.service plymouth-quit.service
+ 
+ [Service]
diff --git a/debian/patches/kubuntu_nvidia-prime.diff b/debian/patches/kubuntu_nvidia-prime.diff
new file mode 100644
index 0000000..2feb002
--- /dev/null
+++ b/debian/patches/kubuntu_nvidia-prime.diff
@@ -0,0 +1,21 @@
+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, you will need to manually run /sbin/prime-switch to shut down
++    /sbin/prime-offload
++fi
diff --git a/debian/patches/series b/debian/patches/series
index 5153474..55288d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@ kubuntu_use_breeze.diff
 kubuntu_dbus-config-rename.diff
 kubuntu_minimum_vt.diff
 upstream_add-graphical.target.diff
+kubuntu_nvidia-prime.diff
+upstream_fix-zsh-Xsession.patch
diff --git a/debian/patches/upstream_fix-zsh-Xsession.patch b/debian/patches/upstream_fix-zsh-Xsession.patch
new file mode 100644
index 0000000..d4d0d35
--- /dev/null
+++ b/debian/patches/upstream_fix-zsh-Xsession.patch
@@ -0,0 +1,23 @@
+## Description: Fix zsh support in Xsession
+## Origin/Author: https://github.com/sddm/sddm/commit/5ab43a6418ec68fe7ba7690a7c9cb3c1552f62dd
+## Bug: 1439826
+Index: sddm-vivid/data/scripts/Xsession
+===================================================================
+--- sddm-vivid.orig/data/scripts/Xsession
++++ sddm-vivid/data/scripts/Xsession
+@@ -22,7 +22,6 @@ case $SHELL in
+     ;;
+   */zsh)
+     [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@"
+-    emulate -R sh
+     [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc
+     zhome=${ZDOTDIR:-$HOME}
+     # zshenv is always sourced automatically.
+@@ -30,6 +29,7 @@ case $SHELL in
+     [ -f $zhome/.zprofile ] && . $zhome/.zprofile
+     [ -f $zdir/zlogin ] && . $zdir/zlogin
+     [ -f $zhome/.zlogin ] && . $zhome/.zlogin
++    emulate -R sh
+     ;;
+   */csh|*/tcsh)
+     # [t]cshrc is always sourced automatically.

-- 
sddm packaging