[SCM] sddm packaging branch, master, updated. debian/0.11.0-3-7-g2b8c7a1

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 0c2cd1aa6041daf85c48d335bbdb6b65303db7ef
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Sep 3 15:03:16 2015 +0200

    Add the Xsession script. (Closes: #794419)
---
 debian/Xsession     | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 debian/changelog    |  1 +
 debian/rules        |  2 +-
 debian/sddm.install |  1 +
 4 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/debian/Xsession b/debian/Xsession
new file mode 100755
index 0000000..3e3994d
--- /dev/null
+++ b/debian/Xsession
@@ -0,0 +1,47 @@
+#! /bin/sh
+# Xsession - run as user
+
+session=$1
+
+# Note that the respective logout scripts are not sourced.
+case $SHELL in
+  */bash)
+    [ -z "$BASH" ] && exec $SHELL $0 "$@"
+    set +o posix
+    [ -f /etc/profile ] && . /etc/profile
+    if [ -f $HOME/.bash_profile ]; then
+      . $HOME/.bash_profile
+    elif [ -f $HOME/.bash_login ]; then
+      . $HOME/.bash_login
+    elif [ -f $HOME/.profile ]; then
+      . $HOME/.profile
+    fi
+    ;;
+  */zsh)
+    [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@"
+    emulate -R zsh
+    [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc
+    zhome=${ZDOTDIR:-$HOME}
+    # zshenv is always sourced automatically.
+    [ -f $zdir/zprofile ] && . $zdir/zprofile
+    [ -f $zhome/.zprofile ] && . $zhome/.zprofile
+    [ -f $zdir/zlogin ] && . $zdir/zlogin
+    [ -f $zhome/.zlogin ] && . $zhome/.zlogin
+    setopt shwordsplit noextendedglob
+    ;;
+  */csh|*/tcsh)
+    # [t]cshrc is always sourced automatically.
+    # Note that sourcing csh.login after .cshrc is non-standard.
+    xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
+    $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c 'export -p' >! $xsess_tmp"
+    . $xsess_tmp
+    rm -f $xsess_tmp
+    ;;
+  *) # Plain sh, ksh, and anything we do not know.
+    [ -f /etc/profile ] && . /etc/profile
+    [ -f $HOME/.profile ] && . $HOME/.profile
+    ;;
+esac
+
+# invoke global X session script
+. /etc/X11/Xsession
diff --git a/debian/changelog b/debian/changelog
index efe1fd4..a820e42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ sddm (0.11.0-4~) UNRELEASED; urgency=medium
   * Add Provides: x-display-manager for sddm (Closes: 795006)
 
   [ Maximiliano Curia ]
+  * Add the Xsession script. (Closes: #794419)
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 03 Sep 2015 14:39:13 +0200
 
diff --git a/debian/rules b/debian/rules
index fbb6c9a..2b3a625 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ override_dh_strip:
 override_dh_auto_configure:
 	dh_auto_configure -- \
 	    -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/${DEB_HOST_MULTIARCH}/sddm \
-	    -DSESSION_COMMAND="/etc/X11/Xsession" \
+	    -DSESSION_COMMAND="/etc/sddm/Xsession" \
 	    ${CMAKE_ARGS}
 
 override_dh_systemd_start:
diff --git a/debian/sddm.install b/debian/sddm.install
index 0c3a672..a0f6cf5 100644
--- a/debian/sddm.install
+++ b/debian/sddm.install
@@ -1,5 +1,6 @@
 etc/dbus-1/system.d/sddm_org.freedesktop.DisplayManager.conf
 etc/pam.d
+debian/Xsession etc/sddm/
 # not installed, as the Debian version is used instead
 #lib/systemd/system/sddm.service
 usr/bin/sddm*

-- 
sddm packaging