[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-114-gcbd564c

[X2Go dev team]

The branch, master has been updated
       via  cbd564c7c77a32ea29b7694c2f5676acc68c756c (commit)
       via  bd5904348c00c7a957c9c5a4809fcf5347d8aa99 (commit)
       via  7eb8aaeb755f671bb380ddf7a8efefb3f67087c3 (commit)
      from  b3d9404c654c051875a1f3abcbd3ff81aa6780b7 (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 cbd564c7c77a32ea29b7694c2f5676acc68c756c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Dec 30 16:05:14 2012 +0100

    move latest patches from Oleksandr and Reinhard into release series 3.1.1.x

commit bd5904348c00c7a957c9c5a4809fcf5347d8aa99
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Dec 30 16:02:42 2012 +0100

    rename nxagent.options to x2goagent.options

commit 7eb8aaeb755f671bb380ddf7a8efefb3f67087c3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Dec 30 15:54:38 2012 +0100

    Revert "simplify installation of files in /etc/x2go"
    
    This reverts commit d3efa1d588e2fa3a6cd029c2f9af6249a662cc14.
    
    The several x2goserver-* packages all contain files for /etc/x2go.
    If the x2goserver package receives all files for /etc/x2go, as well,
    then we will have duplicate files in the x2goserver-* packages.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |   26 +++++++++++---------
 debian/x2goserver.install                          |    3 ++-
 x2goserver/Makefile                                |    6 ++---
 x2goserver/bin/x2gostartagent                      |    4 +--
 .../etc/{nxagent.options => x2goagent.options}     |    0
 5 files changed, 21 insertions(+), 18 deletions(-)
 rename x2goserver/etc/{nxagent.options => x2goagent.options} (100%)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 7d734c6..f8c1904 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,18 +34,6 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (3.2.0.0):
     - Use new script x2gopath in Perl::API. (Fixes: #86).
 
-  [ Oleksandr Shneyder ]
-  * Fix SSHFS mounting from Ubuntu clients
-  * create /tmp/.X11-unix if not exists
-
-  [ Reinhard Tartler ]
-  * Introduce /etc/x2go/nxagent.options to allow overriding nxagent options
-    This new configuration file specifies default options that clients can
-    override.
-  * Disable XFIXES and GLX. Both are known to cause certain
-    problems. Hopefully we find better solutions so that we can reenable
-    them soon.
-
  -- Reinhard Tartler <siretart at tauware.de>  Thu, 20 Dec 2012 10:15:26 +0100
 
 x2goserver (3.1.1.10-0~x2go1) UNRELEASED; urgency=low
@@ -66,6 +54,20 @@ x2goserver (3.1.1.10-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (3.1.1.10):
     - Honour CFLAGS when compiling the server's sgid wrapper script (Fixes: #83).
 
+  [ Oleksandr Shneyder ]
+  * New upstream version (3.1.1.10):
+    - Fix SSHFS mounting from Ubuntu clients.
+    - Create /tmp/.X11-unix if not exists.
+
+  [ Reinhard Tartler ]
+  * New upstream version (3.1.1.10):
+    - 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
+      problems. Hopefully we find better solutions so that we can reenable
+      them soon.
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 23 Nov 2012 15:35:48 +0100
 
 x2goserver (3.1.1.9-0~x2go1) unstable; urgency=low
diff --git a/debian/x2goserver.install b/debian/x2goserver.install
index aa51fcd..6427950 100644
--- a/debian/x2goserver.install
+++ b/debian/x2goserver.install
@@ -1,6 +1,7 @@
-etc
 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).