x2go-commits

x2go-commits@lists.x2go.org

37909 discussions

x2goclient.git - master (branch) updated: 3.99.2.1-9-ga2d95c0
by git-admin＠x2go.org 08 Aug '12

08 Aug '12

The branch, master has been updated via a2d95c0c106923162bb510c88806b7384786b97d (commit) from 3335fca16afaa0792207228115e31630894dee71 (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 a2d95c0c106923162bb510c88806b7384786b97d Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Date: Wed Aug 8 11:34:37 2012 +0200 Cleaning code: double click on running session. Instead of using function "sleep" starting resume-session after suspend-session is returned ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++-- onmainwindow.cpp | 27 ++++++++++++++++++--------- onmainwindow.h | 1 + 3 files changed, 23 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 443d9d2..31fa55d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goclient (3.99.2.2-0~x2go1) UNRELEASED; urgency=low +x2goclient (3.99.2.2-0~x2go2) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (3.99.2.2): @@ -18,8 +18,10 @@ x2goclient (3.99.2.2-0~x2go1) UNRELEASED; urgency=low [ Oleksandr Shneyder ] * Fixing X2Go Plugin + * Cleaning code: double click on running session. Instead of using function "sleep" + starting resume-session after suspend-session is returned - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 08 Jun 2012 23:17:02 +0200 + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Wed, 08 Aug 2012 11:32:08 +0200 x2goclient (3.99.2.1-0~x2go1) unstable; urgency=low diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 965cbf8..1bded10 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -101,6 +101,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) noSessionEdit=false; lastSession=0l; changeBrokerPass=false; + resumeAfterSuspending=false; appSeparator=0; @@ -3956,15 +3957,19 @@ void ONMainWindow::slotResumeSess() { x2goSession s=getSelectedSession(); QDesktopWidget wd; - if ( isColorDepthOk ( wd.depth(),s.colorDepth ) ) { - if ( s.status=="R" ) { - suspendSession ( s.sessionId ); - x2goDebug << "sleeping for two seconds between suspending and resuming"; - int sleeptime = 2; - while ((sleeptime = sleep (sleeptime))) {}; + if ( isColorDepthOk ( wd.depth(),s.colorDepth ) ) + { + if ( s.status=="R" && ! resumeAfterSuspending) + { + resumeAfterSuspending=true; + slotSuspendSess(); + return; } + resumeAfterSuspending=false; resumeSession ( s ); - } else { + } + else + { QString depth=QString::number ( s.colorDepth ); int res; if ( s.colorDepth==24 || s.colorDepth==32 ) @@ -4131,6 +4136,10 @@ void ONMainWindow::slotRetSuspSess ( bool result, QString output, } if ( selectSessionDlg->isVisible() ) selectSessionDlg->setEnabled ( true ); + if (resumeAfterSuspending) + { + slotResumeSess(); + } } @@ -8950,8 +8959,8 @@ void ONMainWindow::startSshd() void ONMainWindow::setProxyWinTitle() { - if(embedMode) - return; + if (embedMode) + return; QString title; diff --git a/onmainwindow.h b/onmainwindow.h index 66b21e8..2d75273 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -520,6 +520,7 @@ private: bool noSessionEdit; bool cleanAllFiles; bool PGPInited; + bool resumeAfterSuspending; struct SshProxy sshProxy; QString sshPort; QString clientSshPort; hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - master (branch) updated: 3.99.2.1-8-g3335fca
by git-admin＠x2go.org 26 Jul '12

26 Jul '12

The branch, master has been updated via 3335fca16afaa0792207228115e31630894dee71 (commit) from 5e5eb0cfffc514ee419a116a78f25ff98728c746 (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 3335fca16afaa0792207228115e31630894dee71 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 26 12:15:52 2012 +0200 X2Go resume session slot: double click on a selected session is supposed to resume that session. To make this feature functional for running sessions the session has to be suspended first. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ onmainwindow.cpp | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 42e7bb6..443d9d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,9 @@ x2goclient (3.99.2.2-0~x2go1) UNRELEASED; urgency=low - Allow x2goclient to connect to user accounts that have other shells than /bin/sh and alike configured as default shell. Also: removal bashisms in shell execution commands. + - X2Go resume session slot: double click on a selected session is supposed + to resume that session. To make this feature functional for running + sessions the session has to be suspended first. [ Oleksandr Shneyder ] * Fixing X2Go Plugin diff --git a/onmainwindow.cpp b/onmainwindow.cpp index b385360..965cbf8 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -3956,10 +3956,15 @@ void ONMainWindow::slotResumeSess() { x2goSession s=getSelectedSession(); QDesktopWidget wd; - if ( isColorDepthOk ( wd.depth(),s.colorDepth ) ) + if ( isColorDepthOk ( wd.depth(),s.colorDepth ) ) { + if ( s.status=="R" ) { + suspendSession ( s.sessionId ); + x2goDebug << "sleeping for two seconds between suspending and resuming"; + int sleeptime = 2; + while ((sleeptime = sleep (sleeptime))) {}; + } resumeSession ( s ); - else - { + } else { QString depth=QString::number ( s.colorDepth ); int res; if ( s.colorDepth==24 || s.colorDepth==32 ) hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - master (branch) updated: 3.99.2.1-7-g5e5eb0c
by git-admin＠x2go.org 26 Jul '12

26 Jul '12

The branch, master has been updated via 5e5eb0cfffc514ee419a116a78f25ff98728c746 (commit) from d4d0fe38610d3e514dc2e4e259ce8f103e4ac535 (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 5e5eb0cfffc514ee419a116a78f25ff98728c746 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 26 11:06:53 2012 +0200 Allow x2goclient to connect to user accounts that have other shells than /bin/sh and alike configured as default shell. Also: removal bashisms in shell execution commands. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ onmainwindow.cpp | 10 +++++----- sshmasterconnection.cpp | 1 + sshprocess.cpp | 6 +++++- 4 files changed, 14 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 27b94f4..42e7bb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ x2goclient (3.99.2.2-0~x2go1) UNRELEASED; urgency=low (see http://wiki.debian.org/Hardening) - Provide CPPFLAGS for QMAKE_CFLAGS _and_ QMAKE_CXXFLAGS. Provide them as first build parameters. + - Allow x2goclient to connect to user accounts that have other shells than + /bin/sh and alike configured as default shell. Also: removal bashisms in + shell execution commands. [ Oleksandr Shneyder ] * Fixing X2Go Plugin diff --git a/onmainwindow.cpp b/onmainwindow.cpp index f68696a..b385360 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -5506,7 +5506,7 @@ void ONMainWindow::runCommand() resumingSession.agentPid + " " + resumingSession.sessionId+" "+ resumingSession.sndPort+ " "+ command+" nosnd "+ - sessionType +">& /dev/null & exit"; + sessionType +" 1> /dev/null 2>/dev/null & exit"; if ( startSessSndSystem ==PULSE ) { cmd="PULSE_CLIENTCONFIG=~/.x2go/C-"+ @@ -5525,7 +5525,7 @@ void ONMainWindow::runCommand() resumingSession.sessionId+" "+ resumingSession.sndPort+ " "+ command+" esd "+ - sessionType +">& /dev/null & exit"; + sessionType +" 1> /dev/null 2>/dev/null & exit"; break; case ARTS: cmd="setsid x2goruncommand "+ @@ -5534,7 +5534,7 @@ void ONMainWindow::runCommand() resumingSession.sessionId+" "+ resumingSession.sndPort+ " "+ command+" arts "+ - sessionType +">& /dev/null & exit"; + sessionType +" 1> /dev/null 2>/dev/null & exit"; break; } @@ -5564,7 +5564,7 @@ void ONMainWindow::runApplication(QString exec) proc->startNormal ("PULSE_CLIENTCONFIG=~/.x2go/C-"+ resumingSession.sessionId+"/.pulse-client.conf DISPLAY=:"+ resumingSession.display+ - " setsid "+exec+">& /dev/null & exit"); + " setsid "+exec+" 1> /dev/null 2>/dev/null & exit"); } void ONMainWindow::slotRetRunCommand ( bool result, QString output, @@ -10272,7 +10272,7 @@ void ONMainWindow::slotStartParec () QString scmd="PULSE_CLIENTCONFIG=~/.x2go/C-"+ resumingSession.sessionId+ "/.pulse-client.conf "+ - "parec > /dev/null &sleep 1 && kill %1"; + "parec 1> /dev/null & sleep 1 && kill %1"; paProc=new SshProcess ( sshConnection, this ); paProc->startNormal ( scmd ); diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index 9eba130..bac6bf8 100644 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -498,6 +498,7 @@ void SshMasterConnection::addChannelConnection ( SshProcess* creator, int sock, void SshMasterConnection::addChannelConnection ( SshProcess* creator, QString cmd ) { + ChannelConnection con; con.channel=NULL; con.sock=-1; diff --git a/sshprocess.cpp b/sshprocess.cpp index e8f0ea6..a0734ba 100644 --- a/sshprocess.cpp +++ b/sshprocess.cpp @@ -130,7 +130,11 @@ void SshProcess::tunnelLoop() void SshProcess::startNormal(const QString& cmd) { - masterCon->addChannelConnection(this, cmd); + QString shcmd = "sh -c \""+cmd+"\""; +// #ifdef DEBUG + x2goDebug<<"executing remote command: "<<shcmd<<endl; +// #endif + masterCon->addChannelConnection(this, shcmd); connect(masterCon,SIGNAL(stdOut(SshProcess*,QByteArray)),this,SLOT(slotStdOut(SshProcess*,QByteArray))); connect(masterCon,SIGNAL(channelClosed(SshProcess*)), this,SLOT(slotChannelClosed(SshProcess*))); } hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

python-x2go.git - master (branch) updated: 0.2.0.8-2-g588ba61
by git-admin＠x2go.org 25 Jul '12

25 Jul '12

The branch, master has been updated via 588ba614baf0ba689a9ec6870284bcd02b4469ae (commit) from 288950f6d62d9b56d0af5637d532836acba82740 (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 588ba614baf0ba689a9ec6870284bcd02b4469ae Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 25 22:23:46 2012 +0200 Become fully functional for users that have SHELLs than sh or bash on remote X2Go server. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++- x2go/backends/control/_stdout.py | 2 ++ 2 files changed, 5 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 33e441e..917408a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ python-x2go (0.2.0.9-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.2.0.9): + - Become fully functional for users that have SHELLs than sh or bash + on remote X2Go server. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 23 Jul 2012 21:20:28 +0200 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index d0441ac..108d6ef 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -368,6 +368,8 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): else: cmd = cmd_line + cmd = 'sh -c \"%s\"' % cmd + if self.session_died: self.logger("control session seams to be dead, not executing command ,,%s'' on X2Go server %s" % (_rerewrite_blanks(cmd), self.profile_name,), loglevel=loglevel) return (cStringIO.StringIO(), cStringIO.StringIO(), cStringIO.StringIO('failed to execute command')) 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

pyhoca-cli.git - master (branch) updated: 0.2.0.3
by git-admin＠x2go.org 24 Jul '12

24 Jul '12

The branch, master has been updated via c65c7036220dabd02c9ec92c9a847ee0d07103ad (commit) from 7b7cf8c6ff244869cc07e171c53db9d43a6df57e (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 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0e92b64..f32e782 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -pyhoca-cli (0.2.0.3-0~x2go1) UNRELEASED; urgency=low +pyhoca-cli (0.2.0.3-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.3): - Fix license header of setup.py file. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 23 Jul 2012 22:23:19 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 24 Jul 2012 02:41:40 +0200 pyhoca-cli (0.2.0.2-0~x2go1) unstable; urgency=low hooks/post-receive -- pyhoca-cli.git (Python X2Go Client (command line client)) 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 "pyhoca-cli.git" (Python X2Go Client (command line client)).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.0.3
by git-admin＠x2go.org 24 Jul '12

24 Jul '12

The branch, master has been updated via 517e348dd855e47197a9c896300b608b2636b779 (commit) from 25c6b915e42d3f6d00a889fba5bb803f8d34576a (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 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f899d9c..e5fd990 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -pyhoca-gui (0.2.0.3-0~x2go1) UNRELEASED; urgency=low +pyhoca-gui (0.2.0.3-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.3): - Fix faulty copyright headers in setup.py, pyhoca/wxgui/messages.py and nsis_template.py. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 12 Jul 2012 21:48:46 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 24 Jul 2012 02:38:29 +0200 pyhoca-gui (0.2.0.2-0~x2go1) unstable; urgency=low hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-cli.git - build-main (branch) updated: 0.2.0.3
by git-admin＠x2go.org 24 Jul '12

24 Jul '12

The branch, build-main has been updated via c65c7036220dabd02c9ec92c9a847ee0d07103ad (commit) via 7b7cf8c6ff244869cc07e171c53db9d43a6df57e (commit) via a2f536ffd45a97671999a223f2b4aabe6eafd10a (commit) from 406d0b9b7f4708f96d94bd6e98c382397dd94874 (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 c65c7036220dabd02c9ec92c9a847ee0d07103ad Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 24 02:45:13 2012 +0200 release 0.2.0.3 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ pyhoca/cli/__init__.py | 2 +- setup.py | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 27a3d84..f32e782 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +pyhoca-cli (0.2.0.3-0~x2go1) unstable; urgency=low + + * New upstream version (0.2.0.3): + - Fix license header of setup.py file. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 24 Jul 2012 02:41:40 +0200 + pyhoca-cli (0.2.0.2-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.2): diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py index 408a2a5..fc81d64 100644 --- a/pyhoca/cli/__init__.py +++ b/pyhoca/cli/__init__.py @@ -25,6 +25,6 @@ For further information on X2Go, please visit the X2Go wiki: http://wiki.x2go.org """ -__VERSION__ = "0.2.0.2" +__VERSION__ = "0.2.0.3" from frontend import * diff --git a/setup.py b/setup.py index b3f0120..72c33c3 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ # # PyHoca is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # PyHoca is distributed in the hope that it will be useful, hooks/post-receive -- pyhoca-cli.git (Python X2Go Client (command line client)) 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 "pyhoca-cli.git" (Python X2Go Client (command line client)).

1 0

pyhoca-gui.git - build-main (branch) updated: 0.2.0.3
by git-admin＠x2go.org 24 Jul '12

24 Jul '12

The branch, build-main has been updated via 517e348dd855e47197a9c896300b608b2636b779 (commit) from 25c6b915e42d3f6d00a889fba5bb803f8d34576a (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 517e348dd855e47197a9c896300b608b2636b779 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 24 02:44:38 2012 +0200 release 0.2.0.3 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f899d9c..e5fd990 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -pyhoca-gui (0.2.0.3-0~x2go1) UNRELEASED; urgency=low +pyhoca-gui (0.2.0.3-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.3): - Fix faulty copyright headers in setup.py, pyhoca/wxgui/messages.py and nsis_template.py. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 12 Jul 2012 21:48:46 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 24 Jul 2012 02:38:29 +0200 pyhoca-gui (0.2.0.2-0~x2go1) unstable; urgency=low hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - build-main (branch) updated: 0.2.0.3
by git-admin＠x2go.org 24 Jul '12

24 Jul '12

The branch, build-main has been updated via 25c6b915e42d3f6d00a889fba5bb803f8d34576a (commit) via 90e379f58839e4b757f73af72fb263b08bc0138a (commit) from 701b63f78215a2c6a75cbe2e1c10a9a220a23a01 (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 ++++++++ nsis_template.py | 17 +++++++++++++++++ pyhoca/wxgui/__init__.py | 2 +- pyhoca/wxgui/messages.py | 2 +- setup.py | 4 ++-- 5 files changed, 29 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4a03674..f899d9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +pyhoca-gui (0.2.0.3-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (0.2.0.3): + - Fix faulty copyright headers in setup.py, pyhoca/wxgui/messages.py + and nsis_template.py. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 12 Jul 2012 21:48:46 +0200 + pyhoca-gui (0.2.0.2-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.2): diff --git a/nsis_template.py b/nsis_template.py index 3c6ce10..f3de719 100644 --- a/nsis_template.py +++ b/nsis_template.py @@ -1,6 +1,23 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# +# PyHoca is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# PyHoca is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + NSIS_SCRIPT_TEMPLATE = """ ;{program_name}.nsi ; diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py index 411c05d..ef6fd76 100644 --- a/pyhoca/wxgui/__init__.py +++ b/pyhoca/wxgui/__init__.py @@ -18,6 +18,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.2.0.2' +__VERSION__ = '0.2.0.3' from frontend import * diff --git a/pyhoca/wxgui/messages.py b/pyhoca/wxgui/messages.py index 95a0a43..ffb9577 100644 --- a/pyhoca/wxgui/messages.py +++ b/pyhoca/wxgui/messages.py @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program; if not, write to the # Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # Contributors to the code of this programme: # Dick Kniep <dick.kniep(a)lindix.nl> diff --git a/setup.py b/setup.py index 8aeceee..abb5df2 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ # # PyHoca is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # PyHoca is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program; if not, write to the # Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # import the PyHoca-GUI import sys hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-cli.git - master (branch) updated: 0.2.0.2-2-g7b7cf8c
by git-admin＠x2go.org 24 Jul '12

24 Jul '12

The branch, master has been updated via 7b7cf8c6ff244869cc07e171c53db9d43a6df57e (commit) from a2f536ffd45a97671999a223f2b4aabe6eafd10a (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 7b7cf8c6ff244869cc07e171c53db9d43a6df57e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 24 02:41:34 2012 +0200 Fix license header of setup.py file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- setup.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 29ffe29..0e92b64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ pyhoca-cli (0.2.0.3-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.2.0.3): + - Fix license header of setup.py file. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 23 Jul 2012 22:23:19 +0200 diff --git a/setup.py b/setup.py index b3f0120..72c33c3 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ # # PyHoca is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # PyHoca is distributed in the hope that it will be useful, hooks/post-receive -- pyhoca-cli.git (Python X2Go Client (command line client)) 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 "pyhoca-cli.git" (Python X2Go Client (command line client)).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits