[SCM] sddm packaging branch, kubuntu_unstable, updated. 29159202703c70e2807f74c7b9a399df22eef5fa

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 29159202703c70e2807f74c7b9a399df22eef5fa
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Apr 8 11:13:42 2015 +0200

    drop upstream patch
---
 debian/patches/series                          |  1 -
 debian/patches/upstream_fix-zsh-Xsession.patch | 23 -----------------------
 2 files changed, 24 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 55288d7..3952b32 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ 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
deleted file mode 100644
index d4d0d35..0000000
--- a/debian/patches/upstream_fix-zsh-Xsession.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-## 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