[SCM] sddm packaging branch, kubuntu_utopic_next, updated. b4bb7693ffaf85b5a07f7bf8894df53cdb31b5cc

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_utopic_next branch:
commit b4bb7693ffaf85b5a07f7bf8894df53cdb31b5cc
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Oct 21 16:01:15 2014 +0200

    update patches
---
 debian/patches/series                             |  1 -
 debian/patches/upstream_fix-xsession-for-zsh.diff | 23 -----------------------
 debian/patches/upstream_xsession-scripts.diff     | 10 +++++-----
 3 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 2bfe9d1..94f9be4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 kubuntu_use_breeze.diff
 kubuntu_dbus-config-rename.diff
-upstream_fix-xsession-for-zsh.diff
 upstream_xsession-scripts.diff
diff --git a/debian/patches/upstream_fix-xsession-for-zsh.diff b/debian/patches/upstream_fix-xsession-for-zsh.diff
deleted file mode 100644
index 803b406..0000000
--- a/debian/patches/upstream_fix-xsession-for-zsh.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Fix SDDM for uses for zsh shell
- code copied from kdm broke use with zsh
-Author: Kevin Funk
-Origin: upstream, https://github.com/sddm/sddm/pull/287
-Bug: https://bugs.launchpad.net/ubuntu/+source/kdebase/+bug/13965
-Forwarded: no, it's from upstream
-Reviewed-by: Kevin Funk
-Last-Update: 2014-10-10
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: sddm-0.9.0/data/scripts/Xsession
-===================================================================
---- sddm-0.9.0.orig/data/scripts/Xsession
-+++ sddm-0.9.0/data/scripts/Xsession
-@@ -22,7 +22,7 @@ case $SHELL in
-     ;;
-   */zsh)
-     [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@"
--    emulate -R zsh
-+    emulate -R sh
-     [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc
-     zhome=${ZDOTDIR:-$HOME}
-     # zshenv is always sourced automatically.
diff --git a/debian/patches/upstream_xsession-scripts.diff b/debian/patches/upstream_xsession-scripts.diff
index dd2aeca..4cde172 100644
--- a/debian/patches/upstream_xsession-scripts.diff
+++ b/debian/patches/upstream_xsession-scripts.diff
@@ -5,12 +5,12 @@ Forwarded: no, from upstream
 Last-Update: 2014-10-09
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: sddm-0.9.0/data/scripts/Xsession
+Index: sddm-0.10.0/data/scripts/Xsession
 ===================================================================
---- sddm-0.9.0.orig/data/scripts/Xsession
-+++ sddm-0.9.0/data/scripts/Xsession
-@@ -57,6 +57,26 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
-   done
+--- sddm-0.10.0.orig/data/scripts/Xsession
++++ sddm-0.10.0/data/scripts/Xsession
+@@ -76,6 +76,26 @@ if [ -d "$xsessionddir" ]; then
+     done
  fi
  
 +# Load Xsession scripts

-- 
sddm packaging