The branch, master has been updated via 80d50f61f48a286e2b6c7499f3866a31a835d365 (commit) from 4cc5be13e554f31ff5b46904087b9824720d7d37 (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 80d50f61f48a286e2b6c7499f3866a31a835d365 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Dec 17 19:04:36 2013 +0100 Use x2gopath in scripts rather than deprecated x2gobasepath. ----------------------------------------------------------------------- Summary of changes: bin/x2goresume-desktopsharing | 2 +- bin/x2gosuspend-desktopsharing | 2 +- bin/x2goterminate-desktopsharing | 2 +- debian/changelog | 1 + debian/control | 2 +- share/x2gofeature.d/x2godesktopsharing.features | 2 +- x2godesktopsharing.spec | 4 +--- 7 files changed, 7 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/bin/x2goresume-desktopsharing b/bin/x2goresume-desktopsharing index aaa2c25..4060d80 100755 --- a/bin/x2goresume-desktopsharing +++ b/bin/x2goresume-desktopsharing @@ -27,7 +27,7 @@ else SESSION_NAME=$X2GO_SESSION fi -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` +X2GO_LIB_PATH=`x2gopath libexec` $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" diff --git a/bin/x2gosuspend-desktopsharing b/bin/x2gosuspend-desktopsharing index 676cab1..37dafb0 100755 --- a/bin/x2gosuspend-desktopsharing +++ b/bin/x2gosuspend-desktopsharing @@ -27,7 +27,7 @@ else SESSION_NAME=$X2GO_SESSION fi -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` +X2GO_LIB_PATH=`x2gopath libexec` $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" diff --git a/bin/x2goterminate-desktopsharing b/bin/x2goterminate-desktopsharing index bbf7675..986ef0b 100755 --- a/bin/x2goterminate-desktopsharing +++ b/bin/x2goterminate-desktopsharing @@ -27,7 +27,7 @@ else SESSION_NAME=$X2GO_SESSION fi -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` +X2GO_LIB_PATH=`x2gopath libexec` $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" diff --git a/debian/changelog b/debian/changelog index 6982fce..4318967 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2godesktopsharing (3.1.1.1-0x2go1) UNRELEASED; urgency=low * New upstream version (3.1.1.1): - Update man pages (Fixes: #281). - Fix FSF address in COPYING file. + - Use x2gopath in scripts rather than deprecated x2gobasepath. * debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Rework LONG_DESCRIPTION in several other aspects. diff --git a/debian/control b/debian/control index a71991f..20e05ff 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, - x2goserver (>= 3.0.99.9-0~), + x2goserver (>= 4.0.0.0-0~), libqt4-gui, Recommends: Description: Share X11 desktops with other users via X2Go diff --git a/share/x2gofeature.d/x2godesktopsharing.features b/share/x2gofeature.d/x2godesktopsharing.features index 2f29612..87ab058 100755 --- a/share/x2gofeature.d/x2godesktopsharing.features +++ b/share/x2gofeature.d/x2godesktopsharing.features @@ -20,7 +20,7 @@ # Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` +X2GO_LIB_PATH=`x2gopath libexec` $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index e6714ea..6f41ab6 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -11,7 +11,7 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}. BuildRequires: desktop-file-utils BuildRequires: qt4-devel Requires: hicolor-icon-theme -Requires: x2goserver >= 3.0.99.9 +Requires: x2goserver >= 4.0.0.0 %if 0%{?el5} # For compatibility with EPEL5 @@ -37,8 +37,6 @@ a local X11 session. %build - - %if 0%{?el5} %{_libdir}/qt4/bin/qmake %else hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing 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 "x2godesktopsharing.git" (Desktop Sharing for X2Go).