This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 44206b1e56c5d47c039445f129a59de5ed97977d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Mar 29 01:16:48 2014 +0100 Provide proper Gentoo support in x2goserver-xsession portion of X2Go Server. (Fixes: #445). --- debian/changelog | 2 ++ x2goserver-xsession/Makefile | 2 ++ x2goserver-xsession/etc/Xsession | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5a0d825..708c0c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -116,6 +116,8 @@ x2goserver (4.0.1.14-0x2go1) UNRELEASED; urgency=low to be removed. - Fix broken file descriptor closures in x2gocleansessions. (Fixes: #441). + - Provide proper Gentoo support in x2goserver-xsession portion of + X2Go Server. (Fixes: #445). * x2goserver.spec: - Let builds for EPEL-7 behave like recent Fedora builds. diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index 7ff0dfc..ee8757b 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -58,6 +58,8 @@ install_config: if [ -e /etc/debian_version ]; then if [ -d $(XSESSIONDIR) ]; then $(INSTALL_SYMLINK) $(XSESSIONDIR) $(DESTDIR)$(ETCDIR)/Xsession.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xsession.d; fi; fi if [ -e /etc/redhat-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/redhat-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/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 install_man: diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession index 5dbdd35..9d901a4 100755 --- a/x2goserver-xsession/etc/Xsession +++ b/x2goserver-xsession/etc/Xsession @@ -128,7 +128,7 @@ if [ -f /etc/debian_version ]; then done set -e fi -elif [ -f /etc/redhat-release ]; then +elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ]; 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