[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-146-g2b29383

[X2Go dev team]

The branch, master has been updated
       via  2b293833404d142273422f06af4553f45486955f (commit)
      from  50d9c0a801d8feffdb72fa0dfdf7d65897b8a10e (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 2b293833404d142273422f06af4553f45486955f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Mar 30 18:36:56 2013 +0100

    As LP issue #985202 has been fixed, we revert back to keeping the XFIXES extension enabled by default.

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

Summary of changes:
 debian/changelog                 |    5 +++++
 x2goserver/etc/x2goagent.options |    4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 88b4015..8a3e972 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,11 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (4.0.0.2):
     - Use x2gopath in Perl scripts to set the lib path. (Fixes: #103).
 
+  [ Mike Gabriel ]
+  * New upstream version (4.0.0.2):
+    - As LP issue #985202 has been fixed, we revert back to keeping the XFIXES
+      extension enabled by default.
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 25 Mar 2013 22:34:11 +0100
 
 x2goserver (4.0.0.1-0~x2go1) unstable; urgency=low
diff --git a/x2goserver/etc/x2goagent.options b/x2goserver/etc/x2goagent.options
index afe12f9..bc6c510 100644
--- a/x2goserver/etc/x2goagent.options
+++ b/x2goserver/etc/x2goagent.options
@@ -7,7 +7,9 @@ X2GO_NXAGENT_DEFAULT_OPTIONS=""
 # Disable XFIXES.
 # Workaround for https://bugs.launchpad.net/ubuntu/+source/libxfixes/+bug/985202
 #
-X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension XFIXES"
+# As LP issue #985202 has been fixed, we revert back to keeping the XFIXES extension
+# enabled by default.
+#X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension XFIXES"
 
 # Disable GLX, the old mesa version is hopelessly outdated anyways.
 # Unbreaks the gnome3 control center


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