This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository telekinesis. from d85e836 debian/control: Add D (telekinesis-server): libbsd-resource-perl. new feeac80 debian/control: Fix/complete package dependencies. new 822aa7a debian/copyright: Add copyright information of upstream files. new c59758e syntax and quotation fixes for X2Go pre-terminate and pre-suspend script The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 - debian/control | 22 +++++++++++++++++++- debian/copyright | 10 +++++++++ .../pre-suspend.d/100_telekinesis-server-suspend | 6 +++--- .../100_telekinesis-server-terminate | 6 +++--- 5 files changed, 37 insertions(+), 8 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/telekinesis.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository telekinesis. commit feeac8037684bd4b681c736e284242077fe193c1 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Dec 17 23:00:30 2014 +0100 debian/control: Fix/complete package dependencies. --- debian/changelog | 1 - debian/control | 22 +++++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6c6370c..97f5eff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,4 +3,3 @@ telekinesis (0.0.6.2-0x2go1) UNRELEASED; urgency=low * Initial release. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 21 May 2014 12:21:30 +0200 - diff --git a/debian/control b/debian/control index 93bc714..57bfc4b 100644 --- a/debian/control +++ b/debian/control @@ -15,11 +15,16 @@ Vcs-Browser: http://code.x2go.org/gitweb?p=telekinesis.git;a=summary Package: telekinesis-server Architecture: all Depends: + ${misc:Depends}, + ${perl:Depends}, libx2go-telekinesis-server-perl (>= ${source:Version}), libx2go-telekinesis-server-perl (<< ${source:Version}.1~), x2goserver-extensions (>= 4.1.0.0~), socat, libnet-sftp-sftpserver-perl, libbsd-resource-perl, + libfile-path-perl, + libglib-perl, + libgtk2-perl, Description: Telekinesis server for X2Go X2Go is a server based computing environment with - session resuming @@ -39,8 +44,9 @@ Package: libx2go-telekinesis-server-perl Section: perl Architecture: all Depends: + ${misc:Depends}, + ${perl:Depends}, libx2go-telekinesis-perl (>= ${source:Version}), libx2go-telekinesis-perl (<< ${source:Version}.1~), - libgtk2-trayicon-perl, Description: Telekinesis server for X2Go (Perl package) X2Go is a server based computing environment with - session resuming @@ -58,7 +64,12 @@ Description: Telekinesis server for X2Go (Perl package) Package: telekinesis-client Architecture: all Depends: + ${misc:Depends}, + ${perl:Depends}, libx2go-telekinesis-client-perl (>= ${source:Version}), libx2go-telekinesis-client-perl (<< ${source:Version}.1~), + libfile-path-perl, + libglib-perl, + libgtk2-perl, Description: Telekinesis client for X2Go X2Go is a server based computing environment with - session resuming @@ -78,7 +89,10 @@ Package: libx2go-telekinesis-client-perl Section: perl Architecture: all Depends: + ${misc:Depends}, + ${perl:Depends}, libx2go-telekinesis-perl (>= ${source:Version}), libx2go-telekinesis-perl (<< ${source:Version}.1~), + libx11-protocol-perl, Description: Telekinesis client for X2Go (Perl package) X2Go is a server based computing environment with - session resuming @@ -96,6 +110,9 @@ Description: Telekinesis client for X2Go (Perl package) Package: libx2go-telekinesis-perl Section: perl Architecture: all +Depends: + ${misc:Depends}, + ${perl:Depends}, Description: Telekinesis for X2Go (common Perl package) X2Go is a server based computing environment with - session resuming @@ -115,7 +132,10 @@ Package: libx2go-telekinesis-apps-perl Section: perl Architecture: all Depends: + ${misc:Depends}, + ${perl:Depends}, libx2go-telekinesis-perl (>= ${source:Version}), libx2go-telekinesis-perl (<< ${source:Version}.1~), + libfile-path-perl, Description: Telekinesis application support for X2Go (Perl package) X2Go is a server based computing environment with - session resuming -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/telekinesis.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository telekinesis. commit 822aa7a13954ab92450362228aa51dd11ae4b652 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Dec 17 23:05:57 2014 +0100 debian/copyright: Add copyright information of upstream files. --- debian/copyright | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/copyright b/debian/copyright index a324828..36b63d9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,6 +3,16 @@ Upstream-Name: Telekinesis Upstream-Contact: X2Go Developers <x2go-dev@lists.x2go.org> Source: http://code.x2go.org/releases/ +Files: client/* + server/* + X2Go/* + Makefile + Makefile.PL +Copyright: + 2013-2014, Guangzhou Nianguan Electronics Technology Co.Ltd. <opensource@gznianguan.com> + 2013-2014, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +License: GPL-2+ + Files: debian/* Copyright: 2014, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/telekinesis.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository telekinesis. commit c59758e37376a871809df54e9dda069c153098d1 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Dec 17 23:06:19 2014 +0100 syntax and quotation fixes for X2Go pre-terminate and pre-suspend script Conflicts: server/lib/x2go/extensions/pre-suspend.d/100_telekinesis-server-suspend server/lib/x2go/extensions/pre-terminate.d/100_telekinesis-server-terminate --- .../pre-suspend.d/100_telekinesis-server-suspend | 6 +++--- .../100_telekinesis-server-terminate | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/lib/x2go/extensions/pre-suspend.d/100_telekinesis-server-suspend b/server/lib/x2go/extensions/pre-suspend.d/100_telekinesis-server-suspend index e4ec62a..e5b0b32 100755 --- a/server/lib/x2go/extensions/pre-suspend.d/100_telekinesis-server-suspend +++ b/server/lib/x2go/extensions/pre-suspend.d/100_telekinesis-server-suspend @@ -21,13 +21,13 @@ export X2GO_SESSION=$1 -X2GO_SESSIONINFO="$(x2golistsessions | grep $X2GO_SESSION)" -TEKICTRL_PORT="$(echo $X2GO_SESSIONINFO | cut -d '|' -f15 | sed -e 's/[^0-9\-]//g')" +X2GO_SESSIONINFO=$(x2golistsessions | grep "$X2GO_SESSION") +TEKICTRL_PORT=$(echo "$X2GO_SESSIONINFO" | cut -d "|" -f15 | sed -e "s/[^0-9\-]//g") TEKIDATA_LOCK="$HOME/.x2go/C-${X2GO_SESSION}/telekinesis-sftp.pid" # if Telekinesis server is in use for this session, try to suspend it if [ -n "$TEKICTRL_PORT" ] && [ "x$TEKICTRL_PORT" != "x-1" ]; then - tekicmd -setSESSIONSUSPEND=1 -setX2GOSID=${X2GO_SESSION} + tekicmd -setSESSIONSUSPEND=1 -setX2GOSID="${X2GO_SESSION}" (if [ -f "$TEKIDATA_LOCK" ]; then sleep 20 kill -9 $(cat "$TEKIDATA_LOCK" | sed -s 's/[^0-9]*//g'); diff --git a/server/lib/x2go/extensions/pre-terminate.d/100_telekinesis-server-terminate b/server/lib/x2go/extensions/pre-terminate.d/100_telekinesis-server-terminate index dfeec80..32f28a8 100755 --- a/server/lib/x2go/extensions/pre-terminate.d/100_telekinesis-server-terminate +++ b/server/lib/x2go/extensions/pre-terminate.d/100_telekinesis-server-terminate @@ -21,13 +21,13 @@ export X2GO_SESSION=$1 -X2GO_SESSIONINFO="$(x2golistsessions | grep $X2GO_SESSION)" -TEKICTRL_PORT="$(echo $X2GO_SESSIONINFO | cut -d '|' -f15 | sed -e 's/[^0-9\-]//g')" +X2GO_SESSIONINFO=$(x2golistsessions | grep "$X2GO_SESSION") +TEKICTRL_PORT=$(echo "$X2GO_SESSIONINFO" | cut -d "|" -f15 | sed -e "s/[^0-9\-]//g") TEKIDATA_LOCK="$HOME/.x2go/C-${X2GO_SESSION}/telekinesis-sftp.pid" # the session is about to be terminated, suspend Telekinesis before that happens if [ -n "$TEKICTRL_PORT" ] && [ "x$TEKICTRL_PORT" != "x-1" ]; then - tekicmd -setSESSIONSUSPEND=1 -setX2GOSID=${X2GO_SESSION} + tekicmd -setSESSIONSUSPEND=1 -setX2GOSID="${X2GO_SESSION}" (if [ -f "$TEKIDATA_LOCK" ]; then sleep 20 kill -9 $(cat "$TEKIDATA_LOCK" | sed -s 's/[^0-9]*//g'); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/telekinesis.git
-
git-admin＠x2go.org