[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.1.1.9-13-gd2ce99b
X2Go dev team
git-admin at x2go.org
Wed Dec 4 06:22:19 CET 2013
The branch, build-baikal has been updated
via d2ce99bd8a74b465711e8a0a775a632282224587 (commit)
from 355c2a9cdba1acc5e373ae5401b8a6731c48bd6a (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 +-
x2goserver/Makefile | 2 +-
x2goserver/bin/x2gostartagent | 4 ++--
.../etc/{nxagent.options => x2goagent.options} | 0
4 files changed, 4 insertions(+), 4 deletions(-)
rename x2goserver/etc/{nxagent.options => x2goagent.options} (100%)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f3cc8ce..3eae5fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,7 +23,7 @@ x2goserver (3.1.1.10-0~x2go1) UNRELEASED; urgency=low
[ Reinhard Tartler ]
* New upstream version (3.1.1.10):
- - Introduce /etc/x2go/nxagent.options to allow overriding nxagent
+ - 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/x2goserver/Makefile b/x2goserver/Makefile
index 62cd30c..43fdccf 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -75,7 +75,7 @@ install_config:
$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql
$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords
$(INSTALL_FILE) etc/x2goserver.conf $(DESTDIR)$(ETCDIR)/
- $(INSTALL_FILE) etc/nxagent.options $(DESTDIR)$(ETCDIR)/
+ $(INSTALL_FILE) etc/x2goagent.options $(DESTDIR)$(ETCDIR)/
$(INSTALL_FILE) etc/x2gosql/sql $(DESTDIR)$(ETCDIR)/x2gosql
$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2go_logout.d
$(INSTALL_FILE) etc/x2go_logout $(DESTDIR)$(ETCDIR)/
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).
More information about the x2go-commits
mailing list