x2go-commits March 2012

x2go-commits@lists.x2go.org

1 participants
192 discussions

python-x2go.git - master (branch) updated: 0.1.1.4-116-gca2f9e2
by git-admin＠x2go.org 04 Mar '12

04 Mar '12

The branch, master has been updated via ca2f9e2dc54d5d41c1c569b812cd724e8511139f (commit) from 7eee17c377885c1f9551819ad7f113fdb6fa0dbe (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 ca2f9e2dc54d5d41c1c569b812cd724e8511139f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Mar 4 20:06:12 2012 +0100 Make x2go module importable on Win32 platforms again. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/terminal/_stdout.py | 6 +--- x2go/defaults.py | 14 +++++++----- x2go/utils.py | 40 ++++++++++++++++++++++++------------- 4 files changed, 37 insertions(+), 24 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 837bcdd..ef8021a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low get never used. - Rename control session method is_folder_sharing_available to is_sshfs_available. + - Make x2go module importable on Win32 platforms again. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 08b8de5..a8c27ce 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -33,7 +33,6 @@ import gevent import cStringIO import copy import shutil -import Xlib # Python X2Go modules import x2go.rforward as rforward @@ -853,9 +852,8 @@ class X2goTerminalSessionSTDOUT(object): timeout -= 1 if self.session_window is not None: - self.session_window.set_input_focus(Xlib.X.RevertToParent, Xlib.X.CurrentTime) - self.session_window.configure(stack_mode=Xlib.X.Above) - self.session_window.circulate(Xlib.X.RaiseLowest) + + utils.raise_session_window(self.session_window) break gevent.sleep(1) diff --git a/x2go/defaults.py b/x2go/defaults.py index 65868f2..7edb59e 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -33,13 +33,15 @@ import platform X2GOCLIENT_OS = platform.system() -import Xlib.display - -# handle missing X displays on package build -try: - X_DISPLAY = Xlib.display.Display() -except Xlib.error.DisplayNameError: - X_DISPLAY = None +if X2GOCLIENT_OS != 'Windows': + import Xlib.display + import Xlib.error + + # handle missing X displays on package build + try: + X_DISPLAY = Xlib.display.Display() + except Xlib.error.DisplayNameError: + X_DISPLAY = None LOCAL_HOME = os.path.expanduser('~') X2GO_SESSIONS_ROOTDIR = '.x2go' diff --git a/x2go/utils.py b/x2go/utils.py index 87c4a4f..1ad5fd0 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -33,15 +33,17 @@ import socket import gevent import string import subprocess -import Xlib # Python X2Go modules from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS -from defaults import X_DISPLAY as _X_DISPLAY from defaults import X2GO_SESSIONPROFILE_DEFAULTS as _X2GO_SESSIONPROFILE_DEFAULTS from defaults import X2GO_MIMEBOX_ACTIONS as _X2GO_MIMEBOX_ACTIONS from defaults import pack_methods_nx3 +if _X2GOCLIENT_OS != 'Windows': + import Xlib + from defaults import X_DISPLAY as _X_DISPLAY + if _X2GOCLIENT_OS == 'Windows': import win32api @@ -471,20 +473,30 @@ def find_session_window(session_name): @type session_name: C{str} """ - # establish connection to the win API in use... - display = _X_DISPLAY - root = display.screen().root + if _X2GOCLIENT_OS != 'Windows': + # establish connection to the win API in use... + display = _X_DISPLAY + root = display.screen().root - success = False - windowIDs = root.get_full_property(display.intern_atom('_NET_CLIENT_LIST'), Xlib.X.AnyPropertyType).value - for windowID in windowIDs: - window = display.create_resource_object('window', windowID) - if session_name in window.get_wm_name(): - success = True - break + success = False + windowIDs = root.get_full_property(display.intern_atom('_NET_CLIENT_LIST'), Xlib.X.AnyPropertyType).value + for windowID in windowIDs: + window = display.create_resource_object('window', windowID) + if session_name in window.get_wm_name(): + success = True + break - if success: - return window + if success: + return window return None +def raise_session_window(session_window): + """\ + Raise session window. + + @param session_window: session window instance + @type session_name: C{obj} + + """ + pass \ No newline at end of file hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.11-13-g4f7c8d0
by git-admin＠x2go.org 01 Mar '12

01 Mar '12

The branch, master has been updated via 4f7c8d079014b28204f6733a4e11708be012b215 (commit) from 95929b8a50ce2ea07c1a0784b58a94fb0b23e36a (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 4f7c8d079014b28204f6733a4e11708be012b215 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 1 22:31:35 2012 +0100 Re-introduce proper Xinerama support on non-multiarch systems. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/libnx-x11.postinst | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f11eef9..9660afd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ nx-libs (2:3.5.0.12-0) UNRELEASED; urgency=low Fixes build failure during ,,make distclean'' calls. * Provide temporary workaround for installation on Debian 64bit with multiarch support (via libnx-x11.postinst and .prerm). + * Re-introduce proper Xinerama support on non-multiarch systems. [ Mihai Moldovan ] * Add patch: 051_nxcomp_macos105-fdisset.full+lite.patch, work around diff --git a/debian/libnx-x11.postinst b/debian/libnx-x11.postinst index 514833c..f584054 100755 --- a/debian/libnx-x11.postinst +++ b/debian/libnx-x11.postinst @@ -24,15 +24,17 @@ case "$1" in ### multiarch support into the Debian source package of ### nx-libs. if dpkg-architecture -qDEB_BUILD_MULTIARCH 1>/dev/null 2>/dev/null; then - rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 - rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 libdir=/usr/lib/$(dpkg-architecture -qDEB_BUILD_MULTIARCH) - if test -e $libdir/libX11.so.6; then - ln -s $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 - fi - if test -e $libdir/libXext.so.6; then - ln -s $libdir/libXext.so.6 /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 - fi + else + libdir=/usr/lib + fi + rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 + rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 + if test -e $libdir/libX11.so.6; then + ln -s $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 + fi + if test -e $libdir/libXext.so.6; then + ln -s $libdir/libXext.so.6 /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 fi ;; hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.11-12-g95929b8
by git-admin＠x2go.org 01 Mar '12

01 Mar '12

The branch, master has been updated via 95929b8a50ce2ea07c1a0784b58a94fb0b23e36a (commit) via 9b17e8a96af48181c60a2dcbd3f94445bdc18623 (commit) from fb274937dea4838ff18724f556305a05282cd45a (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 95929b8a50ce2ea07c1a0784b58a94fb0b23e36a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 1 22:27:26 2012 +0100 no bashisms in package scripts commit 9b17e8a96af48181c60a2dcbd3f94445bdc18623 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 1 22:26:38 2012 +0100 changelog cleanup: fixing too-long-line ----------------------------------------------------------------------- Summary of changes: debian/changelog | 9 ++++----- debian/libnx-x11.postinst | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 578cdac..f11eef9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,11 +15,10 @@ nx-libs (2:3.5.0.12-0) UNRELEASED; urgency=low nxcomp/Split.cpp. [ Oleksandr Shneyder ] - * Create patch: 203_nxagent_disable-rootless-exit.full.patch. - Add command line argument "-norootlessexit". - Usually, nxagent exits after 30 seconds if running in rootless mode - and no X-Clients are present. Starting nxagent with option "-norootlessexit" - will change this behaviour. + * Add patch: 203_nxagent_disable-rootless-exit.full.patch, add command line + argument "-norootlessexit". Usually, nxagent exits after 30 seconds if + running in rootless mode and no X-Clients are present. Starting nxagent + with option "-norootlessexit" will change this behaviour. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 15:05:38 +0100 diff --git a/debian/libnx-x11.postinst b/debian/libnx-x11.postinst index ed56bd7..514833c 100755 --- a/debian/libnx-x11.postinst +++ b/debian/libnx-x11.postinst @@ -23,7 +23,7 @@ case "$1" in ### FIXME: this is a work-around while we have not implemented ### multiarch support into the Debian source package of ### nx-libs. - if dpkg-architecture -qDEB_BUILD_MULTIARCH &>/dev/null; then + if dpkg-architecture -qDEB_BUILD_MULTIARCH 1>/dev/null 2>/dev/null; then rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 libdir=/usr/lib/$(dpkg-architecture -qDEB_BUILD_MULTIARCH) hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.11-10-gfb27493
by git-admin＠x2go.org 01 Mar '12

01 Mar '12

The branch, master has been updated via fb274937dea4838ff18724f556305a05282cd45a (commit) via 055436f481b323da2e354eddb76b3099cd96e6ff (commit) from 3776a6f417d4844f92b035eec2ca3d06466ec4e8 (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 fb274937dea4838ff18724f556305a05282cd45a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 1 22:13:32 2012 +0100 Provide temporary workaround for installation on Debian 64bit with multiarch support (via libnx-x11.postinst and .prerm). commit 055436f481b323da2e354eddb76b3099cd96e6ff Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 1 22:06:08 2012 +0100 fix wrong lib-name in libnx-x11.postinst ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- debian/libnx-x11.postinst | 2 +- debian/libnx-x11.prerm | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100755 debian/libnx-x11.prerm The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 68d4012..578cdac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ nx-libs (2:3.5.0.12-0) UNRELEASED; urgency=low packaging. Test for Makefiles in subfolders before calling them. Fixes build failure during ,,make distclean'' calls. * Provide temporary workaround for installation on Debian 64bit with - multiarch support. + multiarch support (via libnx-x11.postinst and .prerm). [ Mihai Moldovan ] * Add patch: 051_nxcomp_macos105-fdisset.full+lite.patch, work around diff --git a/debian/libnx-x11.postinst b/debian/libnx-x11.postinst index ad5a094..ed56bd7 100755 --- a/debian/libnx-x11.postinst +++ b/debian/libnx-x11.postinst @@ -30,7 +30,7 @@ case "$1" in if test -e $libdir/libX11.so.6; then ln -s $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 fi - if test -e $libdir/libNX_Xext.so.6; then + if test -e $libdir/libXext.so.6; then ln -s $libdir/libXext.so.6 /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 fi fi diff --git a/debian/libnx-x11.prerm b/debian/libnx-x11.prerm new file mode 100755 index 0000000..3fcd330 --- /dev/null +++ b/debian/libnx-x11.prerm @@ -0,0 +1,42 @@ +#!/bin/sh +# postrm script for x2goserver-fmbindings +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postrm> `remove' +# * <postrm> `purge' +# * <old-postrm> `upgrade' <new-version> +# * <new-postrm> `failed-upgrade' <old-version> +# * <new-postrm> `abort-install' +# * <new-postrm> `abort-install' <old-version> +# * <new-postrm> `abort-upgrade' <old-version> +# * <disappearer's-postrm> `disappear' <overwriter> +# <overwriter-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + if test -e /usr/lib/nx/X11/Xinerama/libNX_X11.so.6; then + rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 + fi + if test -e /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6; then + rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 + fi + ;; + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.11-8-g3776a6f
by git-admin＠x2go.org 01 Mar '12

01 Mar '12

The branch, master has been updated via 3776a6f417d4844f92b035eec2ca3d06466ec4e8 (commit) from a71cebf0418d1d2c4fbc1012957bf1f1b54742cc (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 3776a6f417d4844f92b035eec2ca3d06466ec4e8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 1 21:53:28 2012 +0100 typofix in libnx-x11.postinst ----------------------------------------------------------------------- Summary of changes: debian/libnx-x11.postinst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/libnx-x11.postinst b/debian/libnx-x11.postinst index 263024f..ad5a094 100755 --- a/debian/libnx-x11.postinst +++ b/debian/libnx-x11.postinst @@ -26,7 +26,7 @@ case "$1" in if dpkg-architecture -qDEB_BUILD_MULTIARCH &>/dev/null; then rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 - $libdir=/usr/lib/$(dpkg-architecture -qDEB_BUILD_MULTIARCH) + libdir=/usr/lib/$(dpkg-architecture -qDEB_BUILD_MULTIARCH) if test -e $libdir/libX11.so.6; then ln -s $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 fi hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

x2goserver.git - master (branch) updated: 3.1.0.0-9-gd10fdac
by git-admin＠x2go.org 01 Mar '12

01 Mar '12

The branch, master has been updated via d10fdac8adf5e55d5ffa4c8cd018501ee5586cbd (commit) from 91360c402b53119703ff4a63c56ba808a42fd543 (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 d10fdac8adf5e55d5ffa4c8cd018501ee5586cbd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 1 21:49:12 2012 +0100 typo ----------------------------------------------------------------------- Summary of changes: debian/x2goserver-fmbindings.postrm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/x2goserver-fmbindings.postrm b/debian/x2goserver-fmbindings.postrm index bad8f5b..f3b3c83 100755 --- a/debian/x2goserver-fmbindings.postrm +++ b/debian/x2goserver-fmbindings.postrm @@ -1,5 +1,5 @@ #!/bin/sh -# postrm script for x2go-fmbindings +# postrm script for x2goserver-fmbindings # # see: dh_installdeb(1) 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).

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.11-7-ga71cebf
by git-admin＠x2go.org 01 Mar '12

01 Mar '12

The branch, master has been updated via a71cebf0418d1d2c4fbc1012957bf1f1b54742cc (commit) from 22d41ae20a02f10f7dd4245e426c0a007d42710c (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 a71cebf0418d1d2c4fbc1012957bf1f1b54742cc Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 1 21:12:54 2012 +0100 Provide temporary workaround for installation on Debian 64bit with multiarch support. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 + debian/libnx-x11.links | 2 - debian/libnx-x11.postinst | 53 +++++++++++++++++++++++++++++++++++++++++++++ debian/post-build-nx.sh | 2 - 4 files changed, 55 insertions(+), 4 deletions(-) create mode 100755 debian/libnx-x11.postinst The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a167637..68d4012 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ nx-libs (2:3.5.0.12-0) UNRELEASED; urgency=low * Update patch: 001_add-main-makefile.full+lite.patch, adapt patch from packaging. Test for Makefiles in subfolders before calling them. Fixes build failure during ,,make distclean'' calls. + * Provide temporary workaround for installation on Debian 64bit with + multiarch support. [ Mihai Moldovan ] * Add patch: 051_nxcomp_macos105-fdisset.full+lite.patch, work around diff --git a/debian/libnx-x11.links b/debian/libnx-x11.links index 82c245f..7331e79 100644 --- a/debian/libnx-x11.links +++ b/debian/libnx-x11.links @@ -1,4 +1,2 @@ -usr/lib/libX11.so.6 usr/lib/nx/X11/Xinerama/libNX_X11.so.6 -usr/lib/libXext.so.6 usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 usr/lib/nx/X11/libNX_Xinerama.so usr/lib/nx/X11/Xinerama/libXinerama.so usr/lib/nx/X11/libNX_Xinerama.so.1 usr/lib/nx/X11/Xinerama/libXinerama.so.1 diff --git a/debian/libnx-x11.postinst b/debian/libnx-x11.postinst new file mode 100755 index 0000000..263024f --- /dev/null +++ b/debian/libnx-x11.postinst @@ -0,0 +1,53 @@ +#!/bin/sh +# postinst script for libnx-x11 +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postinst> `configure' <most-recently-configured-version> +# * <old-postinst> `abort-upgrade' <new version> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package> +# <new-version> +# * <postinst> `abort-remove' +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +# <failed-install-package> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + configure) + ### FIXME: this is a work-around while we have not implemented + ### multiarch support into the Debian source package of + ### nx-libs. + if dpkg-architecture -qDEB_BUILD_MULTIARCH &>/dev/null; then + rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 + rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 + $libdir=/usr/lib/$(dpkg-architecture -qDEB_BUILD_MULTIARCH) + if test -e $libdir/libX11.so.6; then + ln -s $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 + fi + if test -e $libdir/libNX_Xext.so.6; then + ln -s $libdir/libXext.so.6 /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 + fi + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/post-build-nx.sh b/debian/post-build-nx.sh index 2d1f8d2..94f18ac 100755 --- a/debian/post-build-nx.sh +++ b/debian/post-build-nx.sh @@ -20,8 +20,6 @@ find nx-X11/exports/lib/ | egrep "^.*\.so$" | while read libpath; do find $libdir/$libfile.* | while read symlink; do ln -s $libfile ${libdir//exports/.build-exports}/$(basename $symlink) done - - done exit 0 hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

x2goserver.git - master (branch) updated: 3.1.0.0-8-g91360c4
by git-admin＠x2go.org 01 Mar '12

01 Mar '12

The branch, master has been updated via 91360c402b53119703ff4a63c56ba808a42fd543 (commit) from dd6fb08b75cec6f5b0cf159dd3dc1c0adafd5d53 (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 91360c402b53119703ff4a63c56ba808a42fd543 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 1 21:04:02 2012 +0100 fix comment lines ----------------------------------------------------------------------- Summary of changes: debian/x2goserver-fmbindings.postinst | 2 +- debian/x2goserver-fmbindings.postrm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/x2goserver-fmbindings.postinst b/debian/x2goserver-fmbindings.postinst index cbe42ae..b64235f 100755 --- a/debian/x2goserver-fmbindings.postinst +++ b/debian/x2goserver-fmbindings.postinst @@ -1,5 +1,5 @@ #!/bin/sh -# postinst script for x2gognomebindings +# postinst script for x2goserver-fmbindings # # see: dh_installdeb(1) diff --git a/debian/x2goserver-fmbindings.postrm b/debian/x2goserver-fmbindings.postrm index 4c31ba2..bad8f5b 100755 --- a/debian/x2goserver-fmbindings.postrm +++ b/debian/x2goserver-fmbindings.postrm @@ -1,5 +1,5 @@ #!/bin/sh -# postrm script for x2gognomebindings +# postrm script for x2go-fmbindings # # see: dh_installdeb(1) 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).

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.11-6-g22d41ae
by git-admin＠x2go.org 01 Mar '12

01 Mar '12

The branch, master has been updated via 22d41ae20a02f10f7dd4245e426c0a007d42710c (commit) from 7e5c04b5db4e859b326ece329099d849906f2bb9 (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 22d41ae20a02f10f7dd4245e426c0a007d42710c Author: Mihai Moldovan <ionic(a)ionic.de> Date: Thu Mar 1 20:43:53 2012 +0100 Update patch: 005_nxcomp_gcc43.full+lite.patch, fix faulty path to nxcomp/Split.cpp. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/patches/005_nxcomp_gcc43.full+lite.patch | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f865f72..a167637 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ nx-libs (2:3.5.0.12-0) UNRELEASED; urgency=low * Add patch: 051_nxcomp_macos105-fdisset.full+lite.patch, work around issue in Mac OS X 10.5 SDK. Pass address of fd_set structs on the stack to the FD_ISSET macro/function, instead of the struct itself. + * Update patch: 005_nxcomp_gcc43.full+lite.patch, fix faulty path to + nxcomp/Split.cpp. [ Oleksandr Shneyder ] * Create patch: 203_nxagent_disable-rootless-exit.full.patch. diff --git a/debian/patches/005_nxcomp_gcc43.full+lite.patch b/debian/patches/005_nxcomp_gcc43.full+lite.patch index 31cb984..bb758c2 100644 --- a/debian/patches/005_nxcomp_gcc43.full+lite.patch +++ b/debian/patches/005_nxcomp_gcc43.full+lite.patch @@ -5,8 +5,8 @@ Description: gcc43 fix Forwarded: not-yet Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Last-Update: 2011-12-31 ---- a/nxcomp/Message.cpp 2010-03-18 19:32:44.476930493 -0300 -+++ b/nxcomp/Message.cpp 2010-03-18 19:40:48.669719034 -0300 +--- a/nxcomp/Message.cpp 2012-03-01 03:46:39.220943822 +0100 ++++ b/nxcomp/Message.cpp 2012-03-01 03:47:27.605712530 +0100 @@ -15,9 +15,9 @@ /* */ /**************************************************************************/ @@ -19,8 +19,8 @@ Last-Update: 2011-12-31 #include <algorithm> ---- a/nxcomp/Misc.cpp 2010-03-18 19:32:44.488465101 -0300 -+++ b/nxcomp/Misc.cpp 2010-03-18 19:40:48.669719034 -0300 +--- a/nxcomp/Misc.cpp 2012-03-01 03:46:39.220943822 +0100 ++++ b/nxcomp/Misc.cpp 2012-03-01 03:47:27.605712530 +0100 @@ -15,11 +15,11 @@ /* */ /**************************************************************************/ @@ -37,8 +37,8 @@ Last-Update: 2011-12-31 #include <errno.h> #include <string.h> ---- a/nxcomp/Misc.h 2010-03-18 19:32:44.488465101 -0300 -+++ b/nxcomp/Misc.h 2010-03-18 19:40:48.669719034 -0300 +--- a/nxcomp/Misc.h 2012-03-01 03:46:39.220943822 +0100 ++++ b/nxcomp/Misc.h 2012-03-01 03:47:27.605712530 +0100 @@ -21,8 +21,8 @@ #include <iostream> #include <fstream> @@ -50,8 +50,8 @@ Last-Update: 2011-12-31 #ifdef __sun ---- a/nxcomp/Proxy.cpp 2010-03-18 19:32:44.547273410 -0300 -+++ b/nxcomp/Proxy.cpp 2010-03-18 19:40:48.669719034 -0300 +--- a/nxcomp/Proxy.cpp 2012-03-01 03:46:39.224943897 +0100 ++++ b/nxcomp/Proxy.cpp 2012-03-01 03:47:27.605712530 +0100 @@ -15,9 +15,9 @@ /* */ /**************************************************************************/ @@ -64,8 +64,8 @@ Last-Update: 2011-12-31 #include <sys/types.h> #include <sys/stat.h> ---- a/nxcomp/Split.cpp 2010-03-18 19:32:44.688465322 -0300 -+++ nxcomp-ubuntu/Split.cpp 2010-03-18 19:40:48.669719034 -0300 +--- a/nxcomp/Split.cpp 2012-03-01 03:46:39.224943897 +0100 ++++ b/nxcomp/Split.cpp 2012-03-01 03:47:27.605712530 +0100 @@ -16,7 +16,7 @@ /**************************************************************************/ hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.11-5-g7e5c04b
by git-admin＠x2go.org 01 Mar '12

01 Mar '12

The branch, master has been updated via 7e5c04b5db4e859b326ece329099d849906f2bb9 (commit) from 655173ff215dde1a167193eafe29bfc955a19561 (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 7e5c04b5db4e859b326ece329099d849906f2bb9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 1 20:39:37 2012 +0100 Pass address of fd_set structs on the stack to the FD_ISSET macro/function, instead of the struct itself. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- .../051_nxcomp_macos105-fdisset.full+lite.patch | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ff0f01e..f865f72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,8 @@ nx-libs (2:3.5.0.12-0) UNRELEASED; urgency=low [ Mihai Moldovan ] * Add patch: 051_nxcomp_macos105-fdisset.full+lite.patch, work around - issue in Mac OS X 10.5 SDK. + issue in Mac OS X 10.5 SDK. Pass address of fd_set structs on the stack + to the FD_ISSET macro/function, instead of the struct itself. [ Oleksandr Shneyder ] * Create patch: 203_nxagent_disable-rootless-exit.full.patch. diff --git a/debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch b/debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch index 86f24e8..6b78a6b 100644 --- a/debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch +++ b/debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch @@ -27,14 +27,14 @@ Author: Mihai Moldovan <ionic(a)ionic.de> *logofs << "Agent: remoteCanRead() is " << - (FD_ISSET(remoteFd_, readSet) && transport_ -> dequeuable() != 0) - << " with FD_ISSET() " << (int) FD_ISSET(remoteFd_, readSet) -+ (FD_ISSET(remoteFd_, readWorkSet) && transport_ -> dequeuable() != 0) -+ << " with FD_ISSET() " << (int) FD_ISSET(remoteFd_, readWorkSet) ++ (FD_ISSET(remoteFd_, &readWorkSet) && transport_ -> dequeuable() != 0) ++ << " with FD_ISSET() " << (int) FD_ISSET(remoteFd_, &readWorkSet) << " and dequeuable " << transport_ -> dequeuable() << ".\n" << logofs_flush; #endif - return (FD_ISSET(remoteFd_, readSet) && -+ return (FD_ISSET(remoteFd_, readWorkSet) && ++ return (FD_ISSET(remoteFd_, &readWorkSet) && transport_ -> dequeuable() != 0); } @@ -47,16 +47,16 @@ Author: Mihai Moldovan <ionic(a)ionic.de> #if defined(TEST) || defined(INFO) *logofs << "Agent: remoteCanWrite() is " << - (FD_ISSET(remoteFd_, writeSet) && transport_ -> -+ (FD_ISSET(remoteFd_, writeWorkSet) && transport_ -> ++ (FD_ISSET(remoteFd_, &writeWorkSet) && transport_ -> queuable() != 0 && canRead_ == 1) << " with FD_ISSET() " - << (int) FD_ISSET(remoteFd_, writeSet) << " queueable " -+ << (int) FD_ISSET(remoteFd_, writeWorkSet) << " queueable " ++ << (int) FD_ISSET(remoteFd_, &writeWorkSet) << " queueable " << transport_ -> queuable() << " channel can read " << canRead_ << ".\n" << logofs_flush; #endif - return (FD_ISSET(remoteFd_, writeSet) && -+ return (FD_ISSET(remoteFd_, writeWorkSet) && ++ return (FD_ISSET(remoteFd_, &writeWorkSet) && transport_ -> queuable() != 0 && canRead_ == 1); } hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits March 2012