The branch, build-baikal has been updated via bd5904348c00c7a957c9c5a4809fcf5347d8aa99 (commit) from 7eb8aaeb755f671bb380ddf7a8efefb3f67087c3 (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 | 2 +- debian/x2goserver.install | 1 + x2goserver/Makefile | 6 +++--- x2goserver/bin/x2gostartagent | 4 ++-- .../etc/{nxagent.options => x2goagent.options} | 0 5 files changed, 7 insertions(+), 6 deletions(-) rename x2goserver/etc/{nxagent.options => x2goagent.options} (100%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7d734c6..25c0aac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,7 +39,7 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low * create /tmp/.X11-unix if not exists [ Reinhard Tartler ] - * Introduce /etc/x2go/nxagent.options to allow overriding nxagent options + * Introduce /etc/x2go/x2goagent.options to allow overriding x2goagent options This new configuration file specifies default options that clients can override. * Disable XFIXES and GLX. Both are known to cause certain diff --git a/debian/x2goserver.install b/debian/x2goserver.install index 259301f..6427950 100644 --- a/debian/x2goserver.install +++ b/debian/x2goserver.install @@ -2,5 +2,6 @@ x2goserver/bin/x2go* /usr/bin/ x2goserver/sbin/x2go* /usr/sbin/ x2goserver/lib/x2go* /usr/lib/x2go/ x2goserver/etc/x2go_logout* /etc/x2go/ +x2goserver/etc/x2goagent.options /etc/x2go/ x2goserver/VERSION.x2goserver /usr/share/x2go/versions/ x2goserver/share/x2gofeature.d /usr/share/x2go/ diff --git a/x2goserver/Makefile b/x2goserver/Makefile index e7f83ef..f2d6d7a 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -67,9 +67,9 @@ install_scripts: install_config: $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2go_logout.d - $(INSTALL_FILE) etc/nxagent.options $(DESTDIR)$(ETCDIR)/ - $(INSTALL_FILE) etc/x2go_logout $(DESTDIR)$(ETCDIR)/ - $(INSTALL_FILE) etc/x2go_logout.d/* $(DESTDIR)$(ETCDIR)/x2go_logout.d/ + $(INSTALL_FILE) etc/x2goagent.options $(DESTDIR)$(ETCDIR)/ + $(INSTALL_FILE) etc/x2go_logout $(DESTDIR)$(ETCDIR)/ + $(INSTALL_FILE) etc/x2go_logout.d/* $(DESTDIR)$(ETCDIR)/x2go_logout.d/ install_man: diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index b8f0087..45b3ba5 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -30,8 +30,8 @@ SSH_PORT=30000 #First ssh port 30001 X2GO_ROOT="${HOME}/.x2go" export NX_ROOT=$X2GO_ROOT -if [ -r /etc/x2go/nxagent.options ]; then - source /etc/x2go/nxagent.options +if [ -r /etc/x2go/x2goagent.options ]; then + source /etc/x2go/x2goagent.options fi if [ -z "$X2GO_NXAGENT_OPTIONS" ]; then diff --git a/x2goserver/etc/nxagent.options b/x2goserver/etc/x2goagent.options similarity index 100% rename from x2goserver/etc/nxagent.options rename to x2goserver/etc/x2goagent.options 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).