This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit ae590fe4f4e1acc916822e10512952dfe9aa742d Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jun 30 10:00:08 2016 +0200 debian/: add x2goagent.options file for compatibility with x2goserver nightly. --- debian/changelog | 2 ++ debian/x2goagent.options | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/debian/changelog b/debian/changelog index b00b5ad..4ad533e 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 0000000..de4735d --- /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" -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 112f0f8169427142da0ad7eeb5f55f81b7e1964f Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jun 30 10:27:31 2016 +0200 debian/rules: symlink and remove new debian/x2goagent.options file into/from build environment. --- debian/changelog | 3 +++ debian/rules | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 316d704..ceba303 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,9 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low - Copy new debian/x2goagent.options file into real tarball environment. * debian/Makefile.nx-libs: - Install/destroot new x2goagent.options file. + * debian/rules: + - Symlink and remove new debian/x2goagent.options file into/from build + environment. [ Mike Gabriel ] * debian/libxinerama1.postinst.in: diff --git a/debian/rules b/debian/rules index 2cd77b3..10a0798 100755 --- a/debian/rules +++ b/debian/rules @@ -33,7 +33,7 @@ override_dh_clean: rm -f nx-X11/programs/nxauth/changelog if [ ! -f replace.sh ] && [ ! -h replace.sh ]; then ln -s debian/Makefile.replace.sh replace.sh; fi . ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done - rm -fR replace.sh Makefile bin etc/rgb VERSION.x2goagent etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard + rm -fR replace.sh Makefile bin etc/rgb VERSION.x2goagent etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard etc/x2goagent.options rm -f debian/nxagent.postinst rm -fR .preserve/ if [ -f nxcomp/.VERSION.NoMachine ]; then mv nxcomp/.VERSION.NoMachine nxcomp/VERSION; fi @@ -114,6 +114,7 @@ override_dh_auto_build: ln -s ../debian/rgb etc/rgb ln -s ../debian/nxagent.keyboard etc/nxagent.keyboard ln -s ../debian/x2goagent.keyboard etc/x2goagent.keyboard + ln -s ../debian/x2goagent.options etc/x2goagent.options mkdir -p doc/ ln -s ../debian/changelog doc/changelog ln -sf debian/VERSION VERSION.x2goagent -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 81f2c9c7db0b28a33b8f8e2b82e5f01d5c257cd5 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jun 30 11:30:00 2016 +0200 nx-libs.spec: let x2goagent package satisfy x2goagent-virtual. --- debian/changelog | 1 + nx-libs.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index d9338c3..e1112c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low to what debian/roll-tarballs.sh does. - Add new x2goagent.options file to installed file list of x2goagent package. + - Let x2goagent package satisfy x2goagent-virtual. * debian/: - Add x2goagent.options file for compatibility with x2goserver nightly. * debian/roll-tarballs.sh: diff --git a/nx-libs.spec b/nx-libs.spec index 5d78109..e0d5d8b 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -651,6 +651,7 @@ This package provides the NX proxy (client) binary. Group: Applications/System Summary: X2Go Agent Requires: nxagent +Provides: x2goagent-virtual %description -n x2goagent X2Go Agent functionality has been completely incorporated into -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit b6bcc2410a10ed09583a431cc2e7c8f4df7f191a Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jun 30 11:09:04 2016 +0200 nx-libs.spec: add new x2goagent.options file to installed file list of x2goagent package. --- debian/changelog | 2 ++ nx-libs.spec | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 90e414f..d9338c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low but RPM doesn't support that too well yet. - Copy new debian/x2goagent.options file into build environment, analogous to what debian/roll-tarballs.sh does. + - Add new x2goagent.options file to installed file list of x2goagent + package. * debian/: - Add x2goagent.options file for compatibility with x2goserver nightly. * debian/roll-tarballs.sh: diff --git a/nx-libs.spec b/nx-libs.spec index 4dee24c..5d78109 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -1146,6 +1146,7 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %dir %{_libdir}/x2go/bin %config(noreplace) %{_sysconfdir}/x2go/keystrokes.cfg %config(noreplace) %{_sysconfdir}/x2go/x2goagent.keyboard +%config(noreplace) %{_sysconfdir}/x2go/x2goagent.options %config(noreplace) %{_sysconfdir}/x2go/rgb %{_bindir}/x2goagent %{_libdir}/x2go/bin/x2goagent -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git