x2go-commits

x2go-commits@lists.x2go.org

37909 discussions

python-x2go.git - master (branch) updated: 0.1.1.4-174-g88f4b2f
by git-admin＠x2go.org 11 Apr '12

11 Apr '12

The branch, master has been updated via 88f4b2fe511dacda626b218ab719056f57e8a3ba (commit) from 74cdf077242ce11351cc8fd238fe39d9b35bcacb (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 88f4b2fe511dacda626b218ab719056f57e8a3ba Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 12 01:44:51 2012 +0200 Implement X2Go-Top category in .desktop files that get used in the context of published applications. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/backends/control/_stdout.py | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c292ac9..61a1016 100644 --- a/debian/changelog +++ b/debian/changelog @@ -78,6 +78,8 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Provide X2goSession method get_session_profile_option(). - Fix unexpected keyword error during connect() in X2goSession instance. - Fix metatype detection of session profiles. + - Implement X2Go-Top category in .desktop files that get used in the + context of published applications. * 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/control/_stdout.py b/x2go/backends/control/_stdout.py index 7e8506d..a56ae31 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -686,7 +686,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): 'System': [], 'Utilities': [], 'Other Applications': [], - 'NO_SUBMENUS': [], + 'TOP': [], } } _empty_menus = _category_map[lang].keys() @@ -715,7 +715,9 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): elif re.match('^Exec=.*', line): _menu_entry_exec = line.split("=")[1].strip() elif re.match('^Categories=.*', line): - if 'Audio' in line or 'Video' in line: + if 'X2Go-Top' in line: + _menu_entry_cat = 'TOP' + elif 'Audio' in line or 'Video' in line: _menu_entry_cat = 'Multimedia' elif 'Development' in line: _menu_entry_cat = 'Development' @@ -748,7 +750,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): _menu_entry_cat = 'Other Applications' if not _render_submenus: - _menu_entry_cat = 'NO_SUBMENUS' + _menu_entry_cat = 'TOP' if _menu_entry_cat in _empty_menus: _empty_menus.remove(_menu_entry_cat) 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.1.4.2-8-gc522c0a
by git-admin＠x2go.org 11 Apr '12

11 Apr '12

The branch, master has been updated via c522c0a7e5bce527de073a51db4adb165f3e9d69 (commit) from 9c63db33b0b31598afb9c0dee92131649c93528b (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 c522c0a7e5bce527de073a51db4adb165f3e9d69 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 12 01:08:30 2012 +0200 license change to AGPLv3+ ----------------------------------------------------------------------- Summary of changes: debian/copyright | 11 ++++++----- debian/pyhoca-cli.docs | 1 + debian/rules | 2 +- setup.py | 6 +++--- 4 files changed, 11 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/copyright b/debian/copyright index 95295ad..9e0534c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -pyhoca-cli - Copyright (C) 2010 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +pyhoca-cli - Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> PyHoca-CLI is free software; you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,13 +16,14 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. Published under the terms of the GNU Affero General Public License. -See http://www.gnu.org/licenses/gpl.html for a recent copy. - -On Debian systems a local copy of the GPL license can also be -found in /usr/share/common-licenses. +See http://www.gnu.org/licenses/agpl-3.0.txt for a recent copy. The code has been packaged for Debian by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +For the contained packaging files for Debian/Ubuntu, however, the +,,normal'' GNU General Public License (version 3 or higher) applies. +A copy of this license can also be found at /usr/share/common-licenses/. + light+love, Mike Gabriel diff --git a/debian/pyhoca-cli.docs b/debian/pyhoca-cli.docs index efae7f1..0199bc0 100644 --- a/debian/pyhoca-cli.docs +++ b/debian/pyhoca-cli.docs @@ -1,3 +1,4 @@ README TODO +LICENSE.txt .build_man2html/html \ No newline at end of file diff --git a/debian/rules b/debian/rules index f4ddccc..0c53906 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # debian/rules file - for pyhoca-cli # Based on sample debian/rules file - for GNU Hello (1.3). -# Copyright 2010 by Mike Gabriel +# Copyright 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> PYVERS=$(shell pyversions -vr) diff --git a/setup.py b/setup.py index 6f04946..b3f0120 100755 --- a/setup.py +++ b/setup.py @@ -22,10 +22,10 @@ from setuptools import setup, find_packages import pyhoca.cli setup( - name = "PyHoca CLI", + name = "PyHoca-CLI", version = pyhoca.cli.__VERSION__, - description = "PyHoca CLI is a cross-platform (Windows, MacOS X, Linux) X2Go client for the command line.", - license = 'GPL', + description = "PyHoca-CLI is a cross-platform (Windows, MacOS X, Linux) X2Go client for the command line.", + license = 'AGPLv3+', author = 'Mike Gabriel', url = 'http://www.x2go.org', packages = [ 'pyhoca.cli', ], 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.1.0.10-181-gd0347ac
by git-admin＠x2go.org 11 Apr '12

11 Apr '12

The branch, master has been updated via d0347ac0ec771cc951fb20b9ed4ebb8992834248 (commit) from deca2609d5529b3d6a1c4f4737b7674ebec2d87b (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 d0347ac0ec771cc951fb20b9ed4ebb8992834248 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 12 01:07:58 2012 +0200 fix file permissions ----------------------------------------------------------------------- Summary of changes: 0 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 debian/rules mode change 100644 => 100755 pyhoca-gui mode change 100644 => 100755 setup.py The diff of changes is: diff --git a/debian/rules b/debian/rules old mode 100644 new mode 100755 diff --git a/pyhoca-gui b/pyhoca-gui old mode 100644 new mode 100755 diff --git a/setup.py b/setup.py old mode 100644 new mode 100755 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 - master (branch) updated: 0.1.0.10-180-gdeca260
by git-admin＠x2go.org 11 Apr '12

11 Apr '12

The branch, master has been updated via deca2609d5529b3d6a1c4f4737b7674ebec2d87b (commit) from 05985163d0026637b5a49e2888d0b7b0cf56276a (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 deca2609d5529b3d6a1c4f4737b7674ebec2d87b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 12 01:07:30 2012 +0200 license change to AGPLv3+ ----------------------------------------------------------------------- Summary of changes: LICENSE.txt | 148 ++++++++++++++++++---------------------- README | 2 +- TODO | 2 +- debian/copyright | 28 ++++++-- debian/pyhoca-gui.docs | 1 + debian/rules | 2 +- pyhoca-gui | 6 +- pyhoca/__init__.py | 6 +- pyhoca/wxgui/__init__.py | 6 +- pyhoca/wxgui/about.py | 6 +- pyhoca/wxgui/basepath.py | 6 +- pyhoca/wxgui/frontend.py | 6 +- pyhoca/wxgui/logon.py | 6 +- pyhoca/wxgui/menus_taskbar.py | 6 +- pyhoca/wxgui/messages.py | 6 +- pyhoca/wxgui/notify.py | 6 +- pyhoca/wxgui/printingprefs.py | 6 +- pyhoca/wxgui/profilemanager.py | 6 +- pyhoca/wxgui/sessiontitle.py | 6 +- pyhoca/wxgui/splash.py | 6 +- pyhoca/wxgui/taskbar.py | 6 +- setup.py | 8 +- 22 files changed, 142 insertions(+), 139 deletions(-) mode change 100755 => 100644 debian/rules mode change 100755 => 100644 pyhoca-gui mode change 100755 => 100644 setup.py The diff of changes is: diff --git a/LICENSE.txt b/LICENSE.txt index a737dcf..dba13ed 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,5 @@ - - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies @@ -8,17 +7,15 @@ Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to +our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +software for all its users. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you @@ -27,44 +24,34 @@ them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. The precise terms and conditions for copying, distribution and modification follow. @@ -73,7 +60,7 @@ modification follow. 0. Definitions. - "This License" refers to version 3 of the GNU General Public License. + "This License" refers to version 3 of the GNU Affero General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. @@ -550,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - 13. Use with the GNU Affero General Public License. + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single +under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General +Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published +GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's +versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. @@ -636,40 +633,29 @@ the "copyright" line and a pointer to where the full notice is found. Copyright (C) <year> <name of author> This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by + 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. This program 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 General Public License for more details. + GNU Affero General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see +For more information on this, and how to apply and follow the GNU AGPL, see <http://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff --git a/README b/README index 4c51227..17b0438 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ pyhoca-gui - Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> -Published under the terms of the GNU General Public License. +Published under the terms of the GNU Affero General Public License. See http://www.gnu.org/licenses/gpl.html for a recent copy. diff --git a/TODO b/TODO index 2c60921..66c8987 100644 --- a/TODO +++ b/TODO @@ -1,7 +1,7 @@ pyhoca-gui - Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> -Published under the terms of the GNU General Public License. +Published under the terms of the GNU Affero General Public License. See http://www.gnu.org/licenses/gpl.html for a recent copy. === pyhoca-gui TODOs === diff --git a/debian/copyright b/debian/copyright index c37131b..5771021 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,14 +1,30 @@ pyhoca-gui - Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> - -Published under the terms of the GNU General Public License. -See http://www.gnu.org/licenses/gpl.html for a recent copy. -On Debian/Ubuntu systems a local copy of the GPL license can also be -found in /usr/share/common-licenses. +PyHoca-GUI 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. -The code has been packaged for Debian/Ubuntu by Mike Gabriel +PyHoca-GUI 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. + +Published under the terms of the GNU Affero General Public License. +See http://www.gnu.org/licenses/agpl-3.0.txt for a recent copy. + +The code has been packaged for Debian by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +For the contained packaging files for Debian/Ubuntu, however, the +,,normal'' GNU General Public License (version 3 or higher) applies. +A copy of this license can also be found at /usr/share/common-licenses/. + light+love, Dick Kniep and Mike Gabriel diff --git a/debian/pyhoca-gui.docs b/debian/pyhoca-gui.docs index efae7f1..0199bc0 100644 --- a/debian/pyhoca-gui.docs +++ b/debian/pyhoca-gui.docs @@ -1,3 +1,4 @@ README TODO +LICENSE.txt .build_man2html/html \ No newline at end of file diff --git a/debian/rules b/debian/rules old mode 100755 new mode 100644 index 1a95cb9..17aba16 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,5 @@ #!/usr/bin/make -f -# debian/rules file - for pyhoca-cli +# debian/rules file - for pyhoca-gui # Based on sample debian/rules file - for GNU Hello (1.3). # Copyright 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> diff --git a/pyhoca-gui b/pyhoca-gui old mode 100755 new mode 100644 index a6ccb3e..65baaf7 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -5,16 +5,16 @@ # Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# 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 GUI 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# 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. diff --git a/pyhoca/__init__.py b/pyhoca/__init__.py index 471fcb8..b25f36b 100644 --- a/pyhoca/__init__.py +++ b/pyhoca/__init__.py @@ -4,16 +4,16 @@ # Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# 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 GUI 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# 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. diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py index 79b242b..a149735 100644 --- a/pyhoca/wxgui/__init__.py +++ b/pyhoca/wxgui/__init__.py @@ -4,16 +4,16 @@ # Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# 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 GUI 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# 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. diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py index f39e3c6..eccd08f 100644 --- a/pyhoca/wxgui/about.py +++ b/pyhoca/wxgui/about.py @@ -4,16 +4,16 @@ # Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# 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 GUI 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# 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. diff --git a/pyhoca/wxgui/basepath.py b/pyhoca/wxgui/basepath.py index 0d96750..118c70b 100644 --- a/pyhoca/wxgui/basepath.py +++ b/pyhoca/wxgui/basepath.py @@ -4,16 +4,16 @@ # Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# 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 GUI 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# 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. diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 3d2d794..16ff51c 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -4,16 +4,16 @@ # Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# 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 GUI 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# 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. diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index f7632d4..df529eb 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -4,16 +4,16 @@ # Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# 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 GUI 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# 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. diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index 315513b..46092af 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -4,16 +4,16 @@ # Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# 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 GUI 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# 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. diff --git a/pyhoca/wxgui/messages.py b/pyhoca/wxgui/messages.py index 18b3bac..59dc0cf 100644 --- a/pyhoca/wxgui/messages.py +++ b/pyhoca/wxgui/messages.py @@ -4,16 +4,16 @@ # Copyright (C) 2010 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# 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. # # This program 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# 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. diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py index bf12d71..523ce47 100644 --- a/pyhoca/wxgui/notify.py +++ b/pyhoca/wxgui/notify.py @@ -4,16 +4,16 @@ # Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# 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 GUI 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# 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. diff --git a/pyhoca/wxgui/printingprefs.py b/pyhoca/wxgui/printingprefs.py index 065cee7..68e9c98 100644 --- a/pyhoca/wxgui/printingprefs.py +++ b/pyhoca/wxgui/printingprefs.py @@ -4,16 +4,16 @@ # Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# 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 GUI 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# 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. diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index c8bad5a..7e4df6f 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -4,16 +4,16 @@ # Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# 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 GUI 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# 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. diff --git a/pyhoca/wxgui/sessiontitle.py b/pyhoca/wxgui/sessiontitle.py index 51a7335..094bae1 100644 --- a/pyhoca/wxgui/sessiontitle.py +++ b/pyhoca/wxgui/sessiontitle.py @@ -4,16 +4,16 @@ # Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# 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 GUI 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# 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. diff --git a/pyhoca/wxgui/splash.py b/pyhoca/wxgui/splash.py index 87687ec..e18547c 100644 --- a/pyhoca/wxgui/splash.py +++ b/pyhoca/wxgui/splash.py @@ -4,16 +4,16 @@ # Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# 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 GUI 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# 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. diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py index df8783a..089b84d 100644 --- a/pyhoca/wxgui/taskbar.py +++ b/pyhoca/wxgui/taskbar.py @@ -4,16 +4,16 @@ # Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# 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 GUI 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# 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. diff --git a/setup.py b/setup.py old mode 100755 new mode 100644 index 5d3ee97..d740484 --- a/setup.py +++ b/setup.py @@ -4,16 +4,16 @@ # 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 General Public License as published by +# 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 # (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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# 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. @@ -27,7 +27,7 @@ PROGRAM_NAME = 'PyHoca-GUI' PROGRAM_DESC = '%s is a cross-platform (Windows, MacOS X, Linux) graphical X2Go client.' % PROGRAM_NAME PROGRAM_VERSION = pyhoca.wxgui.__VERSION__ PROGRAM_ICON = "pixmaps/pyhoca_x2go-logo-ubuntu.ico" -LICENSE = 'GPLv3+' +LICENSE = 'AGPLv3+' AUTHOR = 'Mike Gabriel, Dick Kniep' URL = 'http://www.x2go.org' LIBRARY_ZIP = r"lib\shardlib.zip" 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

python-x2go.git - master (branch) updated: 0.1.1.4-173-g74cdf07
by git-admin＠x2go.org 11 Apr '12

11 Apr '12

The branch, master has been updated via 74cdf077242ce11351cc8fd238fe39d9b35bcacb (commit) from 68d7a9d5781cfa069141d5f7a596a2508666739a (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 74cdf077242ce11351cc8fd238fe39d9b35bcacb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 12 01:06:53 2012 +0200 fix license / copyright passages ----------------------------------------------------------------------- Summary of changes: LICENSE => LICENSE.txt | 0 Makefile.docupload | 2 +- README | 4 ++-- debian/copyright | 13 +++++++++---- debian/python-x2go.docs | 1 + debian/rules | 2 +- examples/x2go_resume_session.py | 2 +- examples/x2go_start_session.py | 2 +- 8 files changed, 16 insertions(+), 10 deletions(-) rename LICENSE => LICENSE.txt (100%) The diff of changes is: diff --git a/LICENSE b/LICENSE.txt similarity index 100% rename from LICENSE rename to LICENSE.txt diff --git a/Makefile.docupload b/Makefile.docupload index f8386cd..aa4869d 100644 --- a/Makefile.docupload +++ b/Makefile.docupload @@ -1,6 +1,6 @@ #!/usr/bin/make -f # Makefile.docupload file - for python-x2go -# Copyright 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, GPLv3 applies to this file +# Copyright 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, GPLv3+ applies to this file VERSION=`head -n1 debian/changelog | sed 's,.*($.*$).*,\1,' | cut -d"-" -f1` DOC_HOST=code.x2go.org diff --git a/README b/README index 21b921f..e4af585 100644 --- a/README +++ b/README @@ -47,8 +47,8 @@ and wholeheartedness concerning this inner process. - if you have a choice: install Ghostscript/GSview on the system that uses Python X2Go applications... it's highly recommended -=== Current features === +=== Current features === * start X2Go agent session * suspend X2Go session @@ -65,8 +65,8 @@ and wholeheartedness concerning this inner process. * desktop sharing (shadow sessions) * color depth auto-recognition -=== Installation === +=== Installation === Ubuntu: ------- diff --git a/debian/copyright b/debian/copyright index 2256bf0..5a23998 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Copyright (C) 2010 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de +Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Python X2Go is free software; you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -15,11 +15,16 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -On Debian/Ubuntu systems a copy of the AGPLv3 license unfortunately -cannot be found at /usr/share/common-licenses/ (see #634607) and is -shipped with this package in /usr/share/doc/python-x2go/LICENSE.gz. +Published under the terms of the GNU Affero General Public License. +See http://www.gnu.org/licenses/agpl-3.0.txt for a recent copy. + +The code has been packaged for Debian by Mike Gabriel +<mike.gabriel(a)das-netzwerkteam.de> For the contained packaging files for Debian/Ubuntu, however, the ,,normal'' GNU General Public License (version 3 or higher) applies. A copy of this license can also be found at /usr/share/common-licenses/. +light+love, +Mike Gabriel + diff --git a/debian/python-x2go.docs b/debian/python-x2go.docs index 415a02b..6c900fe 100644 --- a/debian/python-x2go.docs +++ b/debian/python-x2go.docs @@ -1,5 +1,6 @@ README README.Trinity-Desktop TODO +LICENSE.txt .epydoc/html/ #.epydoc/pdf/ diff --git a/debian/rules b/debian/rules index a912612..c1d1c52 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # debian/rules file - for python-x2go # Based on sample debian/rules file - for GNU Hello (1.3). -# Copyright 2010 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> PYVERS=$(shell pyversions -vr) diff --git a/examples/x2go_resume_session.py b/examples/x2go_resume_session.py index d755860..5fdb29a 100644 --- a/examples/x2go_resume_session.py +++ b/examples/x2go_resume_session.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/examples/x2go_start_session.py b/examples/x2go_start_session.py index 48244e4..d260f64 100644 --- a/examples/x2go_start_session.py +++ b/examples/x2go_start_session.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by 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.1.4.2-7-g9c63db3
by git-admin＠x2go.org 11 Apr '12

11 Apr '12

The branch, master has been updated via 9c63db33b0b31598afb9c0dee92131649c93528b (commit) from c9127546eb02e1633969f363697a98c009e6a386 (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 9c63db33b0b31598afb9c0dee92131649c93528b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 12 00:43:44 2012 +0200 fix file permissions (x-bit) ----------------------------------------------------------------------- Summary of changes: 0 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 debian/rules mode change 100644 => 100755 pyhoca-cli mode change 100644 => 100755 setup.py The diff of changes is: diff --git a/debian/rules b/debian/rules old mode 100644 new mode 100755 diff --git a/pyhoca-cli b/pyhoca-cli old mode 100644 new mode 100755 diff --git a/setup.py b/setup.py old mode 100644 new mode 100755 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-cli.git - master (branch) updated: 0.1.4.2-6-gc912754
by git-admin＠x2go.org 11 Apr '12

11 Apr '12

The branch, master has been updated via c9127546eb02e1633969f363697a98c009e6a386 (commit) from 844198f8829e6d23d69ffa9bc092ca560ab73c35 (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 c9127546eb02e1633969f363697a98c009e6a386 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 12 00:43:07 2012 +0200 happy new year, license change to AGPLv3+ ----------------------------------------------------------------------- Summary of changes: Makefile.docupload | 2 +- README | 4 ++-- TODO | 4 ++-- debian/copyright | 8 ++++---- man/man1/pyhoca-cli.1 | 2 +- pyhoca-cli | 8 ++++---- pyhoca/__init__.py | 8 ++++---- pyhoca/cli/__init__.py | 8 ++++---- pyhoca/cli/frontend.py | 8 ++++---- setup.py | 8 ++++---- 10 files changed, 30 insertions(+), 30 deletions(-) mode change 100755 => 100644 debian/rules mode change 100755 => 100644 pyhoca-cli mode change 100755 => 100644 setup.py The diff of changes is: diff --git a/Makefile.docupload b/Makefile.docupload index 1a6c71d..825b319 100644 --- a/Makefile.docupload +++ b/Makefile.docupload @@ -1,6 +1,6 @@ #!/usr/bin/make -f # Makefile.docupload file - for pyhoca-cli -# Copyright 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, GPLv3 applies to this file +# Copyright 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, AGPLv3+ applies to this file VERSION=`head -n1 debian/changelog | sed 's,.*($.*$).*,\1,' | cut -d"-" -f1` DOC_HOST=code.x2go.org diff --git a/README b/README index 84cba90..f513376 100644 --- a/README +++ b/README @@ -1,10 +1,10 @@ -pyhoca-cli - Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +pyhoca-cli - Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Contributors: Jörg Sawatzki <joerg.sawatzki(a)web.de> Dick Kniep <dick.kniep(a)lindix.nl> -Published under the terms of the GNU General Public License. +Published under the terms of the GNU Affero General Public License. See http://www.gnu.org/licenses/gpl.html for a recent copy. diff --git a/TODO b/TODO index 93bcd20..685f653 100644 --- a/TODO +++ b/TODO @@ -1,10 +1,10 @@ -pyhoca-cli - Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +pyhoca-cli - Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Contributors: Jörg Sawatzki <joerg.sawatzki(a)web.de> Dick Kniep <dick.kniep(a)lindix.nl> -Published under the terms of the GNU General Public License. +Published under the terms of the GNU Affero General Public License. See http://www.gnu.org/licenses/gpl.html for a recent copy. diff --git a/debian/copyright b/debian/copyright index c07c534..95295ad 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,21 +1,21 @@ pyhoca-cli - Copyright (C) 2010 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> PyHoca-CLI is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by +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-CLI 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 General Public License for more details. +GNU Affero General Public License for more details. -You should have received a copy of the GNU General Public License +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. -Published under the terms of the GNU General Public License. +Published under the terms of the GNU Affero General Public License. See http://www.gnu.org/licenses/gpl.html for a recent copy. On Debian systems a local copy of the GPL license can also be diff --git a/debian/rules b/debian/rules old mode 100755 new mode 100644 diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1 index efbc033..9590cbe 100644 --- a/man/man1/pyhoca-cli.1 +++ b/man/man1/pyhoca-cli.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH pyhoca-cli 1 "07 Sep 2011" "Version 0.1.4.x" "X2Go Application" +.TH pyhoca-cli 1 "Apr 2012" "Version 0.1.4.x" "X2Go Application" .SH NAME pyhoca-cli \- X2Go command line client written in Python .SH SYNOPSIS diff --git a/pyhoca-cli b/pyhoca-cli old mode 100755 new mode 100644 index cd7f62d..fcd02fb --- a/pyhoca-cli +++ b/pyhoca-cli @@ -1,19 +1,19 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # PyHoca CLI is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# 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 CLI 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# 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. diff --git a/pyhoca/__init__.py b/pyhoca/__init__.py index 6204815..23f929b 100644 --- a/pyhoca/__init__.py +++ b/pyhoca/__init__.py @@ -1,18 +1,18 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # PyHoca CLI is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# 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 CLI 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# 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. diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py index bb65c60..d7fb69b 100644 --- a/pyhoca/cli/__init__.py +++ b/pyhoca/cli/__init__.py @@ -1,18 +1,18 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Dick Kniep <m.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # PyHoca CLI is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# 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 CLI 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# 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. diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 5d650a3..d79bcd4 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -1,18 +1,18 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # PyHoca CLI is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# 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 CLI 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# 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. diff --git a/setup.py b/setup.py old mode 100755 new mode 100644 index 204f8d7..6f04946 --- a/setup.py +++ b/setup.py @@ -1,19 +1,19 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> +# 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 General Public License as published by +# 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 # (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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# 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. 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

python-x2go.git - master (branch) updated: 0.1.1.4-172-g68d7a9d
by git-admin＠x2go.org 11 Apr '12

11 Apr '12

The branch, master has been updated via 68d7a9d5781cfa069141d5f7a596a2508666739a (commit) from 7409baafe0c326f2ed9dd1845df38344a6b1ffc8 (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 68d7a9d5781cfa069141d5f7a596a2508666739a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 11 10:08:22 2012 +0200 happy new year ----------------------------------------------------------------------- Summary of changes: Makefile.docupload | 2 +- README | 2 +- TODO | 2 +- x2go/__init__.py | 2 +- x2go/backends/__init__.py | 2 +- x2go/backends/control/__init__.py | 2 +- x2go/backends/control/_stdout.py | 2 +- x2go/backends/info/__init__.py | 2 +- x2go/backends/info/_stdout.py | 2 +- x2go/backends/printing/__init__.py | 2 +- x2go/backends/printing/_file.py | 2 +- x2go/backends/printing/_gconf.py | 2 +- x2go/backends/printing/_winreg.py | 2 +- x2go/backends/profiles/__init__.py | 2 +- x2go/backends/profiles/_file.py | 2 +- x2go/backends/profiles/_gconf.py | 2 +- x2go/backends/profiles/_httpsbroker.py | 2 +- x2go/backends/profiles/_winreg.py | 2 +- x2go/backends/proxy/__init__.py | 2 +- x2go/backends/proxy/_nx3.py | 2 +- x2go/backends/proxy/base.py | 2 +- x2go/backends/settings/__init__.py | 2 +- x2go/backends/settings/_file.py | 2 +- x2go/backends/settings/_gconf.py | 2 +- x2go/backends/settings/_winreg.py | 2 +- x2go/backends/terminal/__init__.py | 2 +- x2go/backends/terminal/_stdout.py | 2 +- x2go/cache.py | 2 +- x2go/checkhosts.py | 2 +- x2go/cleanup.py | 2 +- x2go/client.py | 2 +- x2go/defaults.py | 2 +- x2go/forward.py | 2 +- x2go/gevent_subprocess.py | 2 +- x2go/guardian.py | 2 +- x2go/inifiles.py | 2 +- x2go/log.py | 2 +- x2go/mimebox.py | 2 +- x2go/mimeboxactions.py | 2 +- x2go/monkey_patch_paramiko.py | 2 +- x2go/printactions.py | 2 +- x2go/printqueue.py | 2 +- x2go/pulseaudio.py | 2 +- x2go/registry.py | 2 +- x2go/rforward.py | 2 +- x2go/session.py | 2 +- x2go/sftpserver.py | 2 +- x2go/sshproxy.py | 2 +- x2go/utils.py | 2 +- x2go/x2go_exceptions.py | 2 +- x2go/xserver.py | 2 +- 51 files changed, 51 insertions(+), 51 deletions(-) The diff of changes is: diff --git a/Makefile.docupload b/Makefile.docupload index ff760c0..f8386cd 100644 --- a/Makefile.docupload +++ b/Makefile.docupload @@ -1,6 +1,6 @@ #!/usr/bin/make -f # Makefile.docupload file - for python-x2go -# Copyright 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, GPLv3 applies to this file +# Copyright 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, GPLv3 applies to this file VERSION=`head -n1 debian/changelog | sed 's,.*($.*$).*,\1,' | cut -d"-" -f1` DOC_HOST=code.x2go.org diff --git a/README b/README index f8e410c..21b921f 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -python-x2go - Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +python-x2go - Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Published under the terms of the GNU Affero General Public License. See http://www.gnu.org/licenses/agpl.html for a recent copy. diff --git a/TODO b/TODO index 24d9389..39e674c 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,4 @@ -python-x2go - Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +python-x2go - Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Published under the terms of the GNU Affero General Public License. See http://www.gnu.org/licenses/agpl.html for a recent copy. diff --git a/x2go/__init__.py b/x2go/__init__.py index cd60a0a..302ccd3 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/backends/__init__.py b/x2go/backends/__init__.py index f6412e4..de9a5a7 100644 --- a/x2go/backends/__init__.py +++ b/x2go/backends/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/backends/control/__init__.py b/x2go/backends/control/__init__.py index 258c051..81de8bb 100644 --- a/x2go/backends/control/__init__.py +++ b/x2go/backends/control/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 1a54f15..7e8506d 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/backends/info/__init__.py b/x2go/backends/info/__init__.py index 9c2aafa..4183215 100644 --- a/x2go/backends/info/__init__.py +++ b/x2go/backends/info/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/backends/info/_stdout.py b/x2go/backends/info/_stdout.py index 76e1163..74f23e4 100644 --- a/x2go/backends/info/_stdout.py +++ b/x2go/backends/info/_stdout.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/backends/printing/__init__.py b/x2go/backends/printing/__init__.py index 80c3083..94cbd97 100644 --- a/x2go/backends/printing/__init__.py +++ b/x2go/backends/printing/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/backends/printing/_file.py b/x2go/backends/printing/_file.py index b7446b9..7be1199 100644 --- a/x2go/backends/printing/_file.py +++ b/x2go/backends/printing/_file.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/backends/printing/_gconf.py b/x2go/backends/printing/_gconf.py index 9552e2c..721ee07 100644 --- a/x2go/backends/printing/_gconf.py +++ b/x2go/backends/printing/_gconf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/backends/printing/_winreg.py b/x2go/backends/printing/_winreg.py index f120507..3129987 100644 --- a/x2go/backends/printing/_winreg.py +++ b/x2go/backends/printing/_winreg.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/backends/profiles/__init__.py b/x2go/backends/profiles/__init__.py index be84fcd..796245b 100644 --- a/x2go/backends/profiles/__init__.py +++ b/x2go/backends/profiles/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/backends/profiles/_file.py b/x2go/backends/profiles/_file.py index dcacfa8..255470e 100644 --- a/x2go/backends/profiles/_file.py +++ b/x2go/backends/profiles/_file.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/backends/profiles/_gconf.py b/x2go/backends/profiles/_gconf.py index f8e6eec..13d8ccf 100644 --- a/x2go/backends/profiles/_gconf.py +++ b/x2go/backends/profiles/_gconf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/backends/profiles/_httpsbroker.py b/x2go/backends/profiles/_httpsbroker.py index 26d57c4..2118468 100644 --- a/x2go/backends/profiles/_httpsbroker.py +++ b/x2go/backends/profiles/_httpsbroker.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/backends/profiles/_winreg.py b/x2go/backends/profiles/_winreg.py index 9b054d9..dee6904 100644 --- a/x2go/backends/profiles/_winreg.py +++ b/x2go/backends/profiles/_winreg.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/backends/proxy/__init__.py b/x2go/backends/proxy/__init__.py index 8f648be..4b15847 100644 --- a/x2go/backends/proxy/__init__.py +++ b/x2go/backends/proxy/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/backends/proxy/_nx3.py b/x2go/backends/proxy/_nx3.py index 9d88986..cfc8457 100644 --- a/x2go/backends/proxy/_nx3.py +++ b/x2go/backends/proxy/_nx3.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py index ea60879..c507c55 100644 --- a/x2go/backends/proxy/base.py +++ b/x2go/backends/proxy/base.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/backends/settings/__init__.py b/x2go/backends/settings/__init__.py index 2b900b4..a1cb355 100644 --- a/x2go/backends/settings/__init__.py +++ b/x2go/backends/settings/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/backends/settings/_file.py b/x2go/backends/settings/_file.py index b3dd81f..19a6c3b 100644 --- a/x2go/backends/settings/_file.py +++ b/x2go/backends/settings/_file.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/backends/settings/_gconf.py b/x2go/backends/settings/_gconf.py index 5b4ad37..c3cc2ed 100644 --- a/x2go/backends/settings/_gconf.py +++ b/x2go/backends/settings/_gconf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/backends/settings/_winreg.py b/x2go/backends/settings/_winreg.py index 6a7acac..20f6bd2 100644 --- a/x2go/backends/settings/_winreg.py +++ b/x2go/backends/settings/_winreg.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/backends/terminal/__init__.py b/x2go/backends/terminal/__init__.py index 78fbe0b..315441e 100644 --- a/x2go/backends/terminal/__init__.py +++ b/x2go/backends/terminal/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 6cfbac1..076ae8f 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/cache.py b/x2go/cache.py index 7860b5c..77cbff2 100644 --- a/x2go/cache.py +++ b/x2go/cache.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/checkhosts.py b/x2go/checkhosts.py index 8682574..b278116 100644 --- a/x2go/checkhosts.py +++ b/x2go/checkhosts.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/cleanup.py b/x2go/cleanup.py index bc4f667..399dfa4 100644 --- a/x2go/cleanup.py +++ b/x2go/cleanup.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/client.py b/x2go/client.py index ef04361..4fed0e3 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify diff --git a/x2go/defaults.py b/x2go/defaults.py index 2baecc7..4cb994d 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/forward.py b/x2go/forward.py index 69f3af1..dca0e70 100644 --- a/x2go/forward.py +++ b/x2go/forward.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/gevent_subprocess.py b/x2go/gevent_subprocess.py index 3aeffe0..6bd6294 100644 --- a/x2go/gevent_subprocess.py +++ b/x2go/gevent_subprocess.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/guardian.py b/x2go/guardian.py index 817f86f..807b104 100644 --- a/x2go/guardian.py +++ b/x2go/guardian.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/inifiles.py b/x2go/inifiles.py index 2f2fc62..9622072 100644 --- a/x2go/inifiles.py +++ b/x2go/inifiles.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/log.py b/x2go/log.py index 61da222..7454f8b 100644 --- a/x2go/log.py +++ b/x2go/log.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/mimebox.py b/x2go/mimebox.py index 71c1e9f..f79872d 100644 --- a/x2go/mimebox.py +++ b/x2go/mimebox.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/mimeboxactions.py b/x2go/mimeboxactions.py index 20cb823..0c8f908 100644 --- a/x2go/mimeboxactions.py +++ b/x2go/mimeboxactions.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/monkey_patch_paramiko.py b/x2go/monkey_patch_paramiko.py index dd04388..f9b373b 100644 --- a/x2go/monkey_patch_paramiko.py +++ b/x2go/monkey_patch_paramiko.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/printactions.py b/x2go/printactions.py index 793ceea..b40ee34 100644 --- a/x2go/printactions.py +++ b/x2go/printactions.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/printqueue.py b/x2go/printqueue.py index f5b99c6..28eca2c 100644 --- a/x2go/printqueue.py +++ b/x2go/printqueue.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/pulseaudio.py b/x2go/pulseaudio.py index d3fdb33..8a90bda 100644 --- a/x2go/pulseaudio.py +++ b/x2go/pulseaudio.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/registry.py b/x2go/registry.py index e30232b..54b9a16 100644 --- a/x2go/registry.py +++ b/x2go/registry.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/rforward.py b/x2go/rforward.py index d41b9c6..dde9fd6 100644 --- a/x2go/rforward.py +++ b/x2go/rforward.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/session.py b/x2go/session.py index 0bab6b9..a1dc490 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/sftpserver.py b/x2go/sftpserver.py index 730acc6..678f838 100644 --- a/x2go/sftpserver.py +++ b/x2go/sftpserver.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # The Python X2Go sFTPServer code was originally written by Richard Murri, # for further information see his website: http://www.richardmurri.com diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py index a4d14ed..5817da3 100644 --- a/x2go/sshproxy.py +++ b/x2go/sshproxy.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/utils.py b/x2go/utils.py index 1703cc5..ce95cad 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/x2go_exceptions.py b/x2go/x2go_exceptions.py index 3178f08..1525359 100644 --- a/x2go/x2go_exceptions.py +++ b/x2go/x2go_exceptions.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2go/xserver.py b/x2go/xserver.py index 7fc0b94..d4a6b95 100644 --- a/x2go/xserver.py +++ b/x2go/xserver.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by 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-gui.git - master (branch) updated: 0.1.0.10-179-g0598516
by git-admin＠x2go.org 11 Apr '12

11 Apr '12

The branch, master has been updated via 05985163d0026637b5a49e2888d0b7b0cf56276a (commit) from 3ac15ccee45500132843039fae9ffdd521f95a1a (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 05985163d0026637b5a49e2888d0b7b0cf56276a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 11 10:07:02 2012 +0200 happy new year ----------------------------------------------------------------------- Summary of changes: Makefile.docupload | 2 +- README | 4 ++-- TODO | 4 ++-- debian/copyright | 4 ++-- debian/rules | 2 +- po/bg.po | 2 +- po/de.po | 2 +- po/en.po | 2 +- po/es.po | 2 +- po/nb_NO.po | 2 +- po/nl.po | 2 +- po/sv.po | 2 +- pyhoca-gui | 6 +++--- pyhoca/__init__.py | 4 ++-- pyhoca/wxgui/__init__.py | 4 ++-- pyhoca/wxgui/about.py | 4 ++-- pyhoca/wxgui/basepath.py | 4 ++-- pyhoca/wxgui/frontend.py | 4 ++-- pyhoca/wxgui/logon.py | 4 ++-- pyhoca/wxgui/menus_taskbar.py | 4 ++-- pyhoca/wxgui/notify.py | 4 ++-- pyhoca/wxgui/printingprefs.py | 4 ++-- pyhoca/wxgui/profilemanager.py | 4 ++-- pyhoca/wxgui/sessiontitle.py | 4 ++-- pyhoca/wxgui/splash.py | 4 ++-- pyhoca/wxgui/taskbar.py | 4 ++-- setup.py | 2 +- 27 files changed, 45 insertions(+), 45 deletions(-) The diff of changes is: diff --git a/Makefile.docupload b/Makefile.docupload index 0607a61..fc1204c 100644 --- a/Makefile.docupload +++ b/Makefile.docupload @@ -1,6 +1,6 @@ #!/usr/bin/make -f # Makefile.docupload file - for pyhoca-gui -# Copyright 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, GPLv3 applies to this file +# Copyright 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, GPLv3 applies to this file VERSION=`head -n1 debian/changelog | sed 's,.*($.*$).*,\1,' | cut -d"-" -f1` DOC_HOST=code.x2go.org diff --git a/README b/README index 36b2700..4c51227 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -pyhoca-gui - Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> - Copyright (C) 2010-2011 by Dick Kniep <dick.kniep(a)lindix.nl> +pyhoca-gui - Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> + Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> Published under the terms of the GNU General Public License. See http://www.gnu.org/licenses/gpl.html for a recent copy. diff --git a/TODO b/TODO index 07f2148..2c60921 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,5 @@ -pyhoca-gui - Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> - Copyright (C) 2010-2011 by Dick Kniep <dick.kniep(a)lindix.nl> +pyhoca-gui - Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> + Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> Published under the terms of the GNU General Public License. See http://www.gnu.org/licenses/gpl.html for a recent copy. diff --git a/debian/copyright b/debian/copyright index 61a9d18..c37131b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ -pyhoca-gui - Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> - Copyright (C) 2010-2011 by Dick Kniep <dick.kniep(a)lindix.nl> +pyhoca-gui - Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> + Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> Published under the terms of the GNU General Public License. See http://www.gnu.org/licenses/gpl.html for a recent copy. diff --git a/debian/rules b/debian/rules index d7c7299..1a95cb9 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # debian/rules file - for pyhoca-cli # Based on sample debian/rules file - for GNU Hello (1.3). -# Copyright 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> #PYVERS=$(shell pyversions -vr) diff --git a/po/bg.po b/po/bg.po index bd67a4e..92279d1 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,5 +1,5 @@ # PyHoca-GUI / i18n. -# Copyright (C) 2010-2011 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # Dick Kniep <dick.kniep(a)lindix.nl> # This file is distributed under the same license as the PyHoca-GUI package. # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011. diff --git a/po/de.po b/po/de.po index b907708..b1c8afe 100644 --- a/po/de.po +++ b/po/de.po @@ -1,5 +1,5 @@ # PyHoca-GUI / i18n. -# Copyright (C) 2010-2011 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # Dick Kniep <dick.kniep(a)lindix.nl> # This file is distributed under the same license as the PyHoca-GUI package. # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011. diff --git a/po/en.po b/po/en.po index 6a3b2c5..7f53c78 100644 --- a/po/en.po +++ b/po/en.po @@ -1,5 +1,5 @@ # PyHoca-GUI / i18n. -# Copyright (C) 2010-2011 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # Dick Kniep <dick.kniep(a)lindix.nl> # This file is distributed under the same license as the PyHoca-GUI package. # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011. diff --git a/po/es.po b/po/es.po index 9faa24d..8c062a6 100644 --- a/po/es.po +++ b/po/es.po @@ -1,5 +1,5 @@ # PyHoca-GUI / i18n. -# Copyright (C) 2010-2011 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # Dick Kniep <dick.kniep(a)lindix.nl> # This file is distributed under the same license as the PyHoca-GUI package. # diff --git a/po/nb_NO.po b/po/nb_NO.po index c1d9647..e9d5c47 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -1,5 +1,5 @@ # PyHoca-GUI / i18n. -# Copyright (C) 2010-2011 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # Dick Kniep <dick.kniep(a)lindix.nl> # This file is distributed under the same license as the PyHoca-GUI package. # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011. diff --git a/po/nl.po b/po/nl.po index 440534c..d38eb69 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,5 +1,5 @@ # PyHoca-GUI / i18n. -# Copyright (C) 2010-2011 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # Dick Kniep <dick.kniep(a)lindix.nl> # This file is distributed under the same license as the PyHoca-GUI package. # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011. diff --git a/po/sv.po b/po/sv.po index 75d90eb..4812d5c 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,5 +1,5 @@ # PyHoca-GUI / i18n. -# Copyright (C) 2010-2011 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # Dick Kniep <dick.kniep(a)lindix.nl> # This file is distributed under the same license as the PyHoca-GUI package. # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011. diff --git a/pyhoca-gui b/pyhoca-gui index 1207bec..a6ccb3e 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep(a)lindix.nl> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -127,7 +127,7 @@ VERSION_TEXT=""" %s[%s] - an X2Go GUI client written in Python ---------------------------------------------------------------------- developed by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -sponsored by Dick Kniep <dick.kniep(a)lindix.nl> (2010-2011) +sponsored by Dick Kniep <dick.kniep(a)lindix.nl> (2010-2012) VERSION: %s diff --git a/pyhoca/__init__.py b/pyhoca/__init__.py index 92271f4..471fcb8 100644 --- a/pyhoca/__init__.py +++ b/pyhoca/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep(a)lindix.nl> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py index b7399bf..79b242b 100644 --- a/pyhoca/wxgui/__init__.py +++ b/pyhoca/wxgui/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep(a)lindix.nl> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py index 855d1a4..f39e3c6 100644 --- a/pyhoca/wxgui/about.py +++ b/pyhoca/wxgui/about.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep(a)lindix.nl> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/pyhoca/wxgui/basepath.py b/pyhoca/wxgui/basepath.py index 4de71b4..0d96750 100644 --- a/pyhoca/wxgui/basepath.py +++ b/pyhoca/wxgui/basepath.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep(a)lindix.nl> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index aa7d061..3d2d794 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep(a)lindix.nl> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index bed3a69..f7632d4 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep(a)lindix.nl> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index 6cbb500..315513b 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep(a)lindix.nl> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py index 06e11da..bf12d71 100644 --- a/pyhoca/wxgui/notify.py +++ b/pyhoca/wxgui/notify.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep(a)lindix.nl> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/pyhoca/wxgui/printingprefs.py b/pyhoca/wxgui/printingprefs.py index b84cae3..065cee7 100644 --- a/pyhoca/wxgui/printingprefs.py +++ b/pyhoca/wxgui/printingprefs.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep(a)lindix.nl> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index b25316f..c8bad5a 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep(a)lindix.nl> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/pyhoca/wxgui/sessiontitle.py b/pyhoca/wxgui/sessiontitle.py index 13f27cf..51a7335 100644 --- a/pyhoca/wxgui/sessiontitle.py +++ b/pyhoca/wxgui/sessiontitle.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep(a)lindix.nl> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/pyhoca/wxgui/splash.py b/pyhoca/wxgui/splash.py index f14ac32..87687ec 100644 --- a/pyhoca/wxgui/splash.py +++ b/pyhoca/wxgui/splash.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep(a)lindix.nl> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py index f75f47f..df8783a 100644 --- a/pyhoca/wxgui/taskbar.py +++ b/pyhoca/wxgui/taskbar.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep(a)lindix.nl> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/setup.py b/setup.py index 445ed4d..5d3ee97 100755 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# 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 General Public License as published by 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.1.4.2-5-g844198f
by git-admin＠x2go.org 11 Apr '12

11 Apr '12

The branch, master has been updated via 844198f8829e6d23d69ffa9bc092ca560ab73c35 (commit) from a92896977c367567119f309411cff500fea1dbaf (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 844198f8829e6d23d69ffa9bc092ca560ab73c35 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 11 10:04:43 2012 +0200 Add code to redirect stdout and stderr when frozen with py2exe. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca-cli | 41 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 40 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index db59077..b4461ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ pyhoca-cli (0.1.4.3-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.1.4.3): - Replace non-code strings ,,X2go'' by ,,X2Go''. + - Add code to redirect stdout and stderr when frozen with py2exe. * Add python-suport (>=0.90) as dependency. Fix project name in control file. * Add proper license to copyright file. diff --git a/pyhoca-cli b/pyhoca-cli index a21fe0a..cd7f62d 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -30,13 +30,50 @@ import x2go import sys import os + +import sys +import os + +PROG_NAME = os.path.basename(sys.argv[0]).replace('.exe', '') +PROG_PID = os.getpid() + +if hasattr(sys, 'frozen') and sys.frozen in ("windows_exe", "console_exe"): + class Win32_Logging(object): + + softspace = 0 + _fname = os.path.join(os.environ['AppData'], PROG_NAME, '%s.log' % PROG_NAME) + _file = None + + def __init__(self, filemode='a'): + self._filemode = filemode + + def write(self, text, **kwargs): + if self._file is None: + try: + try: + os.mkdir(os.path.dirname(self._fname)) + except: + pass + self._file = open(self._fname, self._filemode) + except: + pass + else: + self._file.write(text) + self._file.flush() + + def flush(self): + if self._file is not None: + self._file.flush() + + sys.stdout = Win32_Logging(filemode='w+') + sys.stderr = Win32_Logging(filemode='a') + del Win32_Logging + app = sys.argv[0] if app.startswith('./'): sys.path.insert(0, os.path.join(os.path.dirname(__file__))) os.environ['PYTHONX2GO_LOCAL'] = '1' -PROG_NAME = os.path.basename(sys.argv[0]) -PROG_PID = os.getpid() PROG_OPTIONS = sys.argv[1:] try: _password_index = PROG_OPTIONS.index('--password')+1 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