This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit 3d98f8999f60840329241d82de6d741d1c2cbc9c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 13 16:30:40 2014 +0200 Trigger Xsession code for SUSE systems (look for /etc/SUSE-brand for SUSE system recognition). --- debian/changelog | 2 ++ x2goserver-xsession/Makefile | 1 - x2goserver-xsession/etc/Xsession | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e382039..b8ae7a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium build system (required for openSUSE/SLES builds). - Fix x2goserver-xsession/Makefile on SUSE. Detect SUSE distro and create Xsession related directory symlinks (xinitrc.d and Xclients.d). + - Trigger Xsession code for SUSE systems (look for /etc/SUSE-brand for + SUSE system recognition). * debian/control: + Add D (x2goserver): libfile-which-perl. * x2goserver.spec: diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index ab42bb5..43f584e 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -61,7 +61,6 @@ install_config: if [ -e /etc/gentoo-release ]; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi if [ -e /etc/gentoo-release ]; then if [ -d $(XCLIENTSDIR) ]; then $(INSTALL_SYMLINK) $(XCLIENTSDIR) $(DESTDIR)$(ETCDIR)/Xclients.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xclients.d; fi; fi if [ -e /etc/os-release ] && cat /etc/os-release | grep "suse" 1>/dev/null; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi - if [ -e /etc/os-release ] && cat /etc/os-release | grep "suse" 1>/dev/null; then if [ -d $(XCLIENTSDIR) ]; then $(INSTALL_SYMLINK) $(XCLIENTSDIR) $(DESTDIR)$(ETCDIR)/Xclients.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xclients.d; fi; fi install_man: diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession index 94692db..3b85b9e 100755 --- a/x2goserver-xsession/etc/Xsession +++ b/x2goserver-xsession/etc/Xsession @@ -130,7 +130,7 @@ if [ -f /etc/debian_version ]; then done set -e fi -elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ]; then +elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE-brand ]; then # define a fallback... (should never be needed). The XSESSION_EXEC var gets set in # X2Go's x2goruncommand script and can be used with obsolete switchdesk or with -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git