x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2gognomebindings.git - master (branch) updated: 2.0.1.7-13-g3dacb5f
by git-admin＠x2go.org 28 Jul '13

28 Jul '13

The branch, master has been updated via 3dacb5f3d849b71c916b953debf0aa849c6b17b3 (commit) from 93fd83bf9e1331098b13bd7cef5c7753fde313a3 (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 3dacb5f3d849b71c916b953debf0aa849c6b17b3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jul 28 03:08:35 2013 +0200 /debian/control: Reduce build-dependencies. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ debian/control | 5 +---- 2 files changed, 8 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d6c7fa5..65929ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,13 @@ x2gognomebindings (2.0.2.0-0~x2go2) UNRELEASED; urgency=low - Rename x2gosuspend.desktop to x2gosuspend-gnome2.destop. - Drop deprecated key in .desktop files: Encoding. - Remove build-cruft. + * /debian/control: + + Drop B-D: libglade2-dev. + + Drop B-D: libglib2.0-dev. + + Drop B-D: libgnome2-dev. + + Drop B-D: libgnomeui-dev. + + Drop B-D: libgtk2.0-dev. + + Add B-D: gnome-common. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 31 Dec 2012 13:40:45 +0100 diff --git a/debian/control b/debian/control index 0e4355e..b7735f0 100644 --- a/debian/control +++ b/debian/control @@ -8,13 +8,10 @@ Uploaders: Build-Depends: autotools-dev, debhelper (>= 7.0.50~), + gnome-common, gnome-pkg-tools, intltool, - libglade2-dev (>= 2.4), - libglib2.0-dev (>= 2.4), libgnome2-dev (>= 2.7), - libgnomeui-dev (>= 2.7), - libgtk2.0-dev (>= 2.4), libnautilus-extension-dev (>= 2.14), pkg-config Standards-Version: 3.9.2 hooks/post-receive -- x2gognomebindings.git (GNOME bindings for X2Go) 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 "x2gognomebindings.git" (GNOME bindings for X2Go).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-200-ge634272
by git-admin＠x2go.org 28 Jul '13

28 Jul '13

The branch, master has been updated via e6342728d39955d1dbe321a3b5af3fcd16a15989 (commit) from 99e3b6282d2db60fe2c0da9a9d19139f96b81419 (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 e6342728d39955d1dbe321a3b5af3fcd16a15989 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jul 28 02:06:57 2013 +0200 release 4.0.1.5 (cherry-picked from release/4.0.1.x branch) Conflicts (resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index cb40b53..9f56c61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,13 +51,13 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low -- Reinhard Tartler <siretart(a)tauware.de> Thu, 20 Dec 2012 10:15:26 +0100 -x2goserver (4.0.1.5-0~x2go1) UNRELEASED; urgency=low +x2goserver (4.0.1.5-0~x2go1) unstable; urgency=low * New upstream version (4.0.1.5): - Do not hard-code paths to NX code in x2goruncommand anymore. Use x2gopath instead. (Fixes: #273). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 28 Jul 2013 01:50:57 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 28 Jul 2013 02:06:47 +0200 x2goserver (4.0.1.4-0~x2go1) unstable; urgency=low 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

x2goserver.git - master (branch) updated: 3.1.1.3-199-g99e3b62
by git-admin＠x2go.org 28 Jul '13

28 Jul '13

The branch, master has been updated via 99e3b6282d2db60fe2c0da9a9d19139f96b81419 (commit) from 50b316f1c5e3a13269d03132bcfe98fd5fdd0c6e (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 99e3b6282d2db60fe2c0da9a9d19139f96b81419 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jul 28 02:06:26 2013 +0200 Do not hard-code paths to NX code in x2goruncommand anymore. Use x2gopath instead. (Fixes: #273). Conflicts (resolved by Mike Gabriel after cherry-picking from release/4.0.1.x branch): debian/changelog x2goserver/bin/x2goruncommand ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++++++ x2goserver/bin/x2gopath | 1 + x2goserver/bin/x2goruncommand | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 63b6ec1..cb40b53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,14 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low -- Reinhard Tartler <siretart(a)tauware.de> Thu, 20 Dec 2012 10:15:26 +0100 +x2goserver (4.0.1.5-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (4.0.1.5): + - Do not hard-code paths to NX code in x2goruncommand anymore. Use + x2gopath instead. (Fixes: #273). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 28 Jul 2013 01:50:57 +0200 + x2goserver (4.0.1.4-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/x2goserver/bin/x2gopath b/x2goserver/bin/x2gopath index 0a70a54..1d2f9f3 100755 --- a/x2goserver/bin/x2gopath +++ b/x2goserver/bin/x2gopath @@ -36,6 +36,7 @@ case "$1" in lib) echo -n "$base/lib/x2go";; libexec) echo -n "$base/lib/x2go";; share) echo -n "$base/share/x2go";; + nx-x11) echo -n "$base/lib/nx/X11";; xinerama) echo -n "$base/lib/nx/X11/Xinerama";; *) exit 1;; esac; diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 29d7c3f..64469ed 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -52,8 +52,8 @@ export QT_GRAPHICSSYSTEM=native IMEXIT="false" -NX_XINERAMA_LIBS=/usr/lib/nx/X11/Xinerama -NX_LIBS=/usr/lib/nx/X11 +NX_XINERAMA_LIBS=$(x2gopath xinerama) +NX_LIBS=$(x2gopath nx-x11) test -n "$LD_LIBRARY_PATH" && \ LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_LIBS:$LD_LIBRARY_PATH" || \ LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_LIBS" 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

x2goserver.git - build-main (branch) updated: 4.0.1.4-1-g9edcabf
by git-admin＠x2go.org 28 Jul '13

28 Jul '13

The branch, build-main has been updated via 9edcabfa9339b78b8aeadca6226e99857184bf69 (commit) from 7d15fe237308213fcc4af56de7f61bc60d387eb7 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4d68ac6..61dbf32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,13 +51,13 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 07 Jun 2013 23:07:40 +0200 -x2goserver (4.0.0.5-0~x2go1) UNRELEASED; urgency=low +x2goserver (4.0.0.5-0~x2go1) unstable; urgency=low * New upstream version (4.0.0.5): - Make x2goumount-session tolerant towards usernames that contain spaces (Fixes: #202). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 13 Jun 2013 14:56:28 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 28 Jul 2013 01:47:03 +0200 x2goserver (4.0.0.4-0~x2go1) unstable; urgency=low diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index 67dc8a8..f510b42 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -4.0.1.3 \ No newline at end of file +4.0.1.5 diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index 67dc8a8..f510b42 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -4.0.1.3 \ No newline at end of file +4.0.1.5 diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index 67dc8a8..f510b42 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -4.0.1.3 \ No newline at end of file +4.0.1.5 diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index 67dc8a8..f510b42 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -4.0.1.3 \ No newline at end of file +4.0.1.5 diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index 67dc8a8..f510b42 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -4.0.1.3 \ No newline at end of file +4.0.1.5 diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index 67dc8a8..f510b42 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -4.0.1.3 \ No newline at end of file +4.0.1.5 diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index 67dc8a8..f510b42 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -4.0.1.3 \ No newline at end of file +4.0.1.5 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

x2goserver.git - build-main (branch) updated: 4.0.1.5
by git-admin＠x2go.org 28 Jul '13

28 Jul '13

The branch, build-main has been updated via 0a2c9a8e38213f12a4601582fd78fdb6c9dce111 (commit) from 6667eefec14315a0f0c16041c973cedefddf0920 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 524abbd..fb1d52f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -x2goserver (4.0.1.5-0~x2go1) UNRELEASED; urgency=low +x2goserver (4.0.1.5-0~x2go1) unstable; urgency=low * New upstream version (4.0.1.5): - Do not hard-code paths to NX code in x2goruncommand anymore. Use x2gopath instead. (Fixes: #273). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 28 Jul 2013 01:50:57 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 28 Jul 2013 02:06:47 +0200 x2goserver (4.0.1.4-0~x2go1) unstable; urgency=low 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

x2goserver.git - build-main (branch) updated: 4.0.1.4-2-g6667eef
by git-admin＠x2go.org 28 Jul '13

28 Jul '13

The branch, build-main has been updated via 6667eefec14315a0f0c16041c973cedefddf0920 (commit) from 9edcabfa9339b78b8aeadca6226e99857184bf69 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++++++ x2goserver/bin/x2gopath | 1 + x2goserver/bin/x2goruncommand | 11 ++--------- 3 files changed, 11 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 61dbf32..524abbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +x2goserver (4.0.1.5-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (4.0.1.5): + - Do not hard-code paths to NX code in x2goruncommand anymore. Use + x2gopath instead. (Fixes: #273). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 28 Jul 2013 01:50:57 +0200 + x2goserver (4.0.1.4-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/x2goserver/bin/x2gopath b/x2goserver/bin/x2gopath index b42c9bb..25cad44 100755 --- a/x2goserver/bin/x2gopath +++ b/x2goserver/bin/x2gopath @@ -36,6 +36,7 @@ case "$1" in lib) echo -n "$base/lib/x2go";; libexec) echo -n "$base/lib/x2go";; share) echo -n "$base/share/x2go";; + nx-x11) echo -n "$base/lib/nx/X11";; xinerama) echo -n "$base/lib/nx/X11/Xinerama";; *) exit 1;; esac; diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 7b3d995..bca44f1 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -52,8 +52,8 @@ export QT_GRAPHICSSYSTEM=native IMEXIT="false" -NX_XINERAMA_LIBS=/usr/lib/nx/X11/Xinerama -NX_LIBS=/usr/lib/nx/X11 +NX_XINERAMA_LIBS=$(x2gopath xinerama) +NX_LIBS=$(x2gopath nx-x11) test -n "$LD_LIBRARY_PATH" && \ LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_LIBS:$LD_LIBRARY_PATH" || \ LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_LIBS" @@ -212,13 +212,6 @@ then X2GO_SESS_TYPE="R" fi -#if [ "$cmd" == "startkde" ]; then -# NX_XRANDR_LIBS=/usr/lib/nx/X11/Xrandr -# LD_LIBRARY_PATH="$NX_XRANDR_LIBS:$LD_LIBRARY_PATH" -# $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "extending LD_LIBRARY_PATH=$LD_LIBRARY_PATH by Xrandr extension" -# export LD_LIBRARY_PATH -#fi - # run x2goserver-extensions for pre-runcommand x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$X2GO_SESSION" pre-runcommand || true 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

x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.4-3-g0a2c9a8
by git-admin＠x2go.org 28 Jul '13

28 Jul '13

The branch, release/4.0.1.x has been updated via 0a2c9a8e38213f12a4601582fd78fdb6c9dce111 (commit) from 6667eefec14315a0f0c16041c973cedefddf0920 (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 0a2c9a8e38213f12a4601582fd78fdb6c9dce111 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jul 28 02:06:57 2013 +0200 release 4.0.1.5 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 524abbd..fb1d52f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -x2goserver (4.0.1.5-0~x2go1) UNRELEASED; urgency=low +x2goserver (4.0.1.5-0~x2go1) unstable; urgency=low * New upstream version (4.0.1.5): - Do not hard-code paths to NX code in x2goruncommand anymore. Use x2gopath instead. (Fixes: #273). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 28 Jul 2013 01:50:57 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 28 Jul 2013 02:06:47 +0200 x2goserver (4.0.1.4-0~x2go1) unstable; urgency=low 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

x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.4-1-g9edcabf
by git-admin＠x2go.org 28 Jul '13

28 Jul '13

The branch, release/4.0.1.x has been updated via 9edcabfa9339b78b8aeadca6226e99857184bf69 (commit) from 7d15fe237308213fcc4af56de7f61bc60d387eb7 (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 9edcabfa9339b78b8aeadca6226e99857184bf69 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jul 28 01:47:58 2013 +0200 Continue development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4d68ac6..61dbf32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,13 +51,13 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 07 Jun 2013 23:07:40 +0200 -x2goserver (4.0.0.5-0~x2go1) UNRELEASED; urgency=low +x2goserver (4.0.0.5-0~x2go1) unstable; urgency=low * New upstream version (4.0.0.5): - Make x2goumount-session tolerant towards usernames that contain spaces (Fixes: #202). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 13 Jun 2013 14:56:28 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 28 Jul 2013 01:47:03 +0200 x2goserver (4.0.0.4-0~x2go1) unstable; urgency=low diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index 67dc8a8..f510b42 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -4.0.1.3 \ No newline at end of file +4.0.1.5 diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index 67dc8a8..f510b42 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -4.0.1.3 \ No newline at end of file +4.0.1.5 diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index 67dc8a8..f510b42 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -4.0.1.3 \ No newline at end of file +4.0.1.5 diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index 67dc8a8..f510b42 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -4.0.1.3 \ No newline at end of file +4.0.1.5 diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index 67dc8a8..f510b42 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -4.0.1.3 \ No newline at end of file +4.0.1.5 diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index 67dc8a8..f510b42 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -4.0.1.3 \ No newline at end of file +4.0.1.5 diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index 67dc8a8..f510b42 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -4.0.1.3 \ No newline at end of file +4.0.1.5 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

x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.4-2-g6667eef
by git-admin＠x2go.org 28 Jul '13

28 Jul '13

The branch, release/4.0.1.x has been updated via 6667eefec14315a0f0c16041c973cedefddf0920 (commit) from 9edcabfa9339b78b8aeadca6226e99857184bf69 (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 6667eefec14315a0f0c16041c973cedefddf0920 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jul 28 02:06:26 2013 +0200 Do not hard-code paths to NX code in x2goruncommand anymore. Use x2gopath instead. (Fixes: #273). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++++++ x2goserver/bin/x2gopath | 1 + x2goserver/bin/x2goruncommand | 11 ++--------- 3 files changed, 11 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 61dbf32..524abbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +x2goserver (4.0.1.5-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (4.0.1.5): + - Do not hard-code paths to NX code in x2goruncommand anymore. Use + x2gopath instead. (Fixes: #273). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 28 Jul 2013 01:50:57 +0200 + x2goserver (4.0.1.4-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/x2goserver/bin/x2gopath b/x2goserver/bin/x2gopath index b42c9bb..25cad44 100755 --- a/x2goserver/bin/x2gopath +++ b/x2goserver/bin/x2gopath @@ -36,6 +36,7 @@ case "$1" in lib) echo -n "$base/lib/x2go";; libexec) echo -n "$base/lib/x2go";; share) echo -n "$base/share/x2go";; + nx-x11) echo -n "$base/lib/nx/X11";; xinerama) echo -n "$base/lib/nx/X11/Xinerama";; *) exit 1;; esac; diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 7b3d995..bca44f1 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -52,8 +52,8 @@ export QT_GRAPHICSSYSTEM=native IMEXIT="false" -NX_XINERAMA_LIBS=/usr/lib/nx/X11/Xinerama -NX_LIBS=/usr/lib/nx/X11 +NX_XINERAMA_LIBS=$(x2gopath xinerama) +NX_LIBS=$(x2gopath nx-x11) test -n "$LD_LIBRARY_PATH" && \ LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_LIBS:$LD_LIBRARY_PATH" || \ LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_LIBS" @@ -212,13 +212,6 @@ then X2GO_SESS_TYPE="R" fi -#if [ "$cmd" == "startkde" ]; then -# NX_XRANDR_LIBS=/usr/lib/nx/X11/Xrandr -# LD_LIBRARY_PATH="$NX_XRANDR_LIBS:$LD_LIBRARY_PATH" -# $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "extending LD_LIBRARY_PATH=$LD_LIBRARY_PATH by Xrandr extension" -# export LD_LIBRARY_PATH -#fi - # run x2goserver-extensions for pre-runcommand x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$X2GO_SESSION" pre-runcommand || true 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

x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.4-2-gce2dada
by git-admin＠x2go.org 27 Jul '13

27 Jul '13

The branch, release/4.0.0.x has been updated via ce2dadab56420e9d5563e19564b04699cd7e9615 (commit) from 1c1bc4d2fb367f6de135d37f1040f11c66ccf5d3 (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 ce2dadab56420e9d5563e19564b04699cd7e9615 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jul 28 01:47:58 2013 +0200 release 4.0.0.5 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index cd382e6..4f7fddf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -x2goserver (4.0.0.5-0~x2go1) UNRELEASED; urgency=low +x2goserver (4.0.0.5-0~x2go1) unstable; urgency=low * New upstream version (4.0.0.5): - Make x2goumount-session tolerant towards usernames that contain spaces (Fixes: #202). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 13 Jun 2013 14:56:28 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 28 Jul 2013 01:47:03 +0200 x2goserver (4.0.0.4-0~x2go1) unstable; urgency=low diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index cdd9b9b..47dee5f 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -4.0.0.4 \ No newline at end of file +4.0.0.5 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index cdd9b9b..47dee5f 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -4.0.0.4 \ No newline at end of file +4.0.0.5 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index cdd9b9b..47dee5f 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -4.0.0.4 \ No newline at end of file +4.0.0.5 \ No newline at end of file diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index cdd9b9b..47dee5f 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -4.0.0.4 \ No newline at end of file +4.0.0.5 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index cdd9b9b..47dee5f 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -4.0.0.4 \ No newline at end of file +4.0.0.5 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index cdd9b9b..47dee5f 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -4.0.0.4 \ No newline at end of file +4.0.0.5 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index cdd9b9b..47dee5f 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -4.0.0.4 \ No newline at end of file +4.0.0.5 \ No newline at end of file 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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits