aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--debian/x2goagent.options36
2 files changed, 38 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index b00b5adc7..4ad533e02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low
* nx-libs.spec:
- Add xkeyboard-config to nxagent's Requires. Should be a weak dependency,
but RPM doesn't support that too well yet.
+ * debian/:
+ - Add x2goagent.options file for compatibility with x2goserver nightly.
[ Mike Gabriel ]
* debian/libxinerama1.postinst.in:
diff --git a/debian/x2goagent.options b/debian/x2goagent.options
new file mode 100644
index 000000000..de4735d7f
--- /dev/null
+++ b/debian/x2goagent.options
@@ -0,0 +1,36 @@
+#
+# This file can be used to specify default options that are passed to nxagent.
+#
+# These options can be overriden by the client!
+#
+# See the output of `nxagent -help` for the full list of options.
+#
+# Remember:
+# "-extension" disables an extension.
+# "+extension" enables an extension.
+
+X2GO_NXAGENT_DEFAULT_OPTIONS=""
+
+# Disable XFIXES.
+# Workaround for https://bugs.launchpad.net/ubuntu/+source/libxfixes/+bug/985202
+#
+X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension XFIXES"
+
+# Uncomment to disable GLX, the old mesa version is hopelessly outdated anyways.
+# Unbreaks the gnome3 control center
+#
+#X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension GLX"
+
+# Launch X2Go's X-server x2goagent with option "-nolisten tcp".
+#
+# This is the default setting and the X2Go developers really recommend not to
+# touch this. However, if you play with this (i.e. if you comment it out) you
+# should really know what you are doing.
+#
+# For everyone else: don't touch the line below!!!
+X2GO_NXAGENT_DEFAULT_OPTIONS+=" -nolisten tcp"
+
+# Enforce clipboard behaviour in X2Go sessions globally (for all connecting clients)
+# Possible values for the -clipboard option: both, server, client, none
+# If this option stays commented out, clients can choose the sessions' clipboard behaviour...
+#X2GO_NXAGENT_DEFAULT_OPTIONS+=" -clipboard both"