diff -Nru sddm-0.11.0/debian/changelog sddm-0.11.0/debian/changelog --- sddm-0.11.0/debian/changelog 2015-04-02 14:08:00.000000000 +0000 +++ sddm-0.11.0/debian/changelog 2015-04-03 09:50:16.000000000 +0000 @@ -1,3 +1,10 @@ +sddm (0.11.0-0ubuntu8) vivid; urgency=medium + + * Add upstream_fix-zsh-Xsession.patch: fix Xsession with zsh from + upstream. LP: #1439826 + + -- Dan McGregor 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 diff -Nru sddm-0.11.0/debian/patches/series sddm-0.11.0/debian/patches/series --- sddm-0.11.0/debian/patches/series 2015-04-02 13:53:07.000000000 +0000 +++ sddm-0.11.0/debian/patches/series 2015-04-03 09:49:13.000000000 +0000 @@ -3,3 +3,4 @@ kubuntu_minimum_vt.diff upstream_add-graphical.target.diff kubuntu_nvidia-prime.diff +upstream_fix-zsh-Xsession.patch diff -Nru sddm-0.11.0/debian/patches/upstream_fix-zsh-Xsession.patch sddm-0.11.0/debian/patches/upstream_fix-zsh-Xsession.patch --- sddm-0.11.0/debian/patches/upstream_fix-zsh-Xsession.patch 1970-01-01 00:00:00.000000000 +0000 +++ sddm-0.11.0/debian/patches/upstream_fix-zsh-Xsession.patch 2015-04-03 09:48:53.000000000 +0000 @@ -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.