[X2Go-Commits] x2goserver.git - build-main (branch) updated: 4.0.1.6-4-g6567318

[X2Go dev team]

The branch, build-main has been updated
       via  6567318201544d31d380a7fabb90de87bfbdb89a (commit)
      from  7d0d4ff8085faca966eacf5b013200e1bf016887 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

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 ce613a0..d6b0af6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,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 ee23fb0..7118d85 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 *)
@@ -68,8 +69,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:
 #	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)


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).