The branch, master has been updated via 9157f221a1f0758f4489baf63f710b5fbfd5b59f (commit) from 6d42e9c609f475e7fd41a20d134147d581fcb0b4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9157f221a1f0758f4489baf63f710b5fbfd5b59f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jul 31 09:06:01 2013 +0200 Fine-tune x2goserver-xsession/Makefile: if /etc/X11 has Xsession.d and/or Xsession.options they get symlinked into /etc/x2go. Otherwise Xsession.d and Xsession.options are created under /etc/x2go as empty dir/file. (Fixes: #278). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++++ x2goserver-xsession/Makefile | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6d20e9f..bfac45a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,6 +61,11 @@ x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low (Fixes: #278). [ Mike Gabriel ] + * New upstream version (4.0.1.7): + - Fine-tune x2goserver-xsession/Makefile: if /etc/X11 has Xsession.d and/or + Xsession.options they get symlinked into /etc/x2go. Otherwise Xsession.d + and Xsession.options are created under /etc/x2go as empty dir/file. + (Fixes: #278). * /debian/control: - Update LONG_DESCRIPTIONS. diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index c83d36d..134cd81 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -21,6 +21,7 @@ MANDIR=$(PREFIX)/share/man SHAREDIR=$(PREFIX)/share/x2go XSESSIONDIR ?= /etc/X11/Xsession.d +XSESSIONOPTIONFILE ?= /etc/X11/Xsession.options #BIN_SCRIPTS=$(shell cd bin && echo *) #SBIN_SCRIPTS=$(shell cd sbin && echo *) @@ -60,8 +61,8 @@ install_config: # provide target dirs for X11 related symlinks $(INSTALL_PROGRAM) etc/Xsession $(DESTDIR)$(ETCDIR)/ $(INSTALL_SYMLINK) /etc/X11/Xresources $(DESTDIR)$(ETCDIR)/ - $(INSTALL_SYMLINK) $(XSESSIONDIR) $(DESTDIR)$(ETCDIR)/Xsession.d - + if [ -e $(XSESSIONOPTIONFILE) ]; then $(INSTALL_SYMLINK) $(XSESSIONOPTIONFILE) $(DESTDIR)$(ETCDIR)/Xsession.options; else touch $(DESTDIR)$(ETCDIR)/Xsession.options; fi + if [ -d $(XSESSIONDIR) ]; then $(INSTALL_SYMLINK) $(XSESSIONDIR) $(DESTDIR)$(ETCDIR)/Xsession.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xsession.d; fi install_man: hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).