This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository python-x2go. from a74403b Only sync password and passphrase if we do not enforce password authentication. new 0610722 common: update copyright notices, whitespace fixes. Happy new year! The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: Makefile.docupload | 2 +- README | 2 +- TODO | 2 +- debian/copyright | 10 +++++----- debian/rules | 2 +- examples/x2go_resume_session.py | 2 +- examples/x2go_start_session.py | 2 +- .../x2go_start_session_with_progress_status.py | 2 +- setup.py | 4 ++-- test.py | 4 ++-- x2go/__init__.py | 2 +- x2go/_paramiko.py | 2 +- x2go/backends/__init__.py | 2 +- x2go/backends/control/__init__.py | 2 +- x2go/backends/control/plain.py | 2 +- x2go/backends/info/__init__.py | 2 +- x2go/backends/info/plain.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/base.py | 2 +- x2go/backends/profiles/file.py | 2 +- x2go/backends/profiles/gconf.py | 2 +- x2go/backends/profiles/httpbroker.py | 2 +- x2go/backends/profiles/sshbroker.py | 2 +- x2go/backends/profiles/winreg.py | 2 +- x2go/backends/proxy/__init__.py | 2 +- x2go/backends/proxy/base.py | 2 +- x2go/backends/proxy/nx3.py | 4 ++-- 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/plain.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/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/telekinesis.py | 2 +- x2go/tests/__init__.py | 4 ++-- x2go/tests/runalltests.py | 4 ++-- x2go/tests/test_printing.py | 4 ++-- x2go/utils.py | 2 +- x2go/x2go_exceptions.py | 2 +- x2go/xserver.py | 2 +- 64 files changed, 74 insertions(+), 74 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 061072250f6e7d82ff0e4c0ec592f5d12dfa993b Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jan 8 19:30:48 2015 +0100 common: update copyright notices, whitespace fixes. Happy new year! --- Makefile.docupload | 2 +- README | 2 +- TODO | 2 +- debian/copyright | 10 +++++----- debian/rules | 2 +- examples/x2go_resume_session.py | 2 +- examples/x2go_start_session.py | 2 +- .../x2go_start_session_with_progress_status.py | 2 +- setup.py | 4 ++-- test.py | 4 ++-- x2go/__init__.py | 2 +- x2go/_paramiko.py | 2 +- x2go/backends/__init__.py | 2 +- x2go/backends/control/__init__.py | 2 +- x2go/backends/control/plain.py | 2 +- x2go/backends/info/__init__.py | 2 +- x2go/backends/info/plain.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/base.py | 2 +- x2go/backends/profiles/file.py | 2 +- x2go/backends/profiles/gconf.py | 2 +- x2go/backends/profiles/httpbroker.py | 2 +- x2go/backends/profiles/sshbroker.py | 2 +- x2go/backends/profiles/winreg.py | 2 +- x2go/backends/proxy/__init__.py | 2 +- x2go/backends/proxy/base.py | 2 +- x2go/backends/proxy/nx3.py | 4 ++-- 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/plain.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/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/telekinesis.py | 2 +- x2go/tests/__init__.py | 4 ++-- x2go/tests/runalltests.py | 4 ++-- x2go/tests/test_printing.py | 4 ++-- x2go/utils.py | 2 +- x2go/x2go_exceptions.py | 2 +- x2go/xserver.py | 2 +- 64 files changed, 74 insertions(+), 74 deletions(-) diff --git a/Makefile.docupload b/Makefile.docupload index 723c538..10fb536 100644 --- a/Makefile.docupload +++ b/Makefile.docupload @@ -1,6 +1,6 @@ #!/usr/bin/make -f # Makefile.docupload file - for python-x2go -# Copyright 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, GPLv3+ applies to this file +# Copyright 2010-2015 by Mike Gabriel <mike.gabriel@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 ec7acfd..2cdd3d3 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -python-x2go - Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +python-x2go - Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 fbdffa6..612ae05 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,4 @@ -python-x2go - Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +python-x2go - Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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/debian/copyright b/debian/copyright index eea667c..f098fe8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,12 +4,12 @@ Upstream-Contact: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Source: http://code.x2go.org/releases/source/python-x2go Files: * -Copyright: 2010-2014, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Copyright: 2010-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: AGPL-3+ Files: x2go/gevent_subprocess.py -Copyright: 2010, Mark Visser <mjmvisser@gmail.com> - 2010-2014, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Copyright: 2010-2015, Mark Visser <mjmvisser@gmail.com> + 2010-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: AGPL-3+ Comment: The file was placed in the ,,public domain'' by Mark Visser and in context of the X2Go project it is published as GPL-3. The file was @@ -17,7 +17,7 @@ Comment: The file was placed in the ,,public domain'' by Mark Visser and http://groups.google.com/group/gevent/browse_thread/thread/dba1a5d29e0a60ff Files: Makefile.docupload -Copyright: 2010-2014, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Copyright: 2010-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: GPL-3+ 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 @@ -39,7 +39,7 @@ License: GPL-3+ `/usr/share/common-licenses/GPL-3'. Files: debian/* -Copyright: 2010-2014, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Copyright: 2010-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: AGPL-3+ License: AGPL-3+ diff --git a/debian/rules b/debian/rules index fe45644..c7eaff1 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-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright 2010-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2") diff --git a/examples/x2go_resume_session.py b/examples/x2go_resume_session.py index e6ba6ff..7bd7dd9 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-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 f84c2ab..0788c24 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-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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_with_progress_status.py b/examples/x2go_start_session_with_progress_status.py index 9184b36..c4388c2 100644 --- a/examples/x2go_start_session_with_progress_status.py +++ b/examples/x2go_start_session_with_progress_status.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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/setup.py b/setup.py index 277729a..baa8e62 100755 --- a/setup.py +++ b/setup.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 # the Free Software Foundation; either version 3 of the License, or diff --git a/test.py b/test.py index 82a30ba..4019be9 100755 --- a/test.py +++ b/test.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 # the Free Software Foundation; either version 3 of the License, or diff --git a/x2go/__init__.py b/x2go/__init__.py index a9f3800..1317f1f 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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/_paramiko.py b/x2go/_paramiko.py index 4f5d8ae..7aed454 100644 --- a/x2go/_paramiko.py +++ b/x2go/_paramiko.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 bf089e0..47a922f 100644 --- a/x2go/backends/__init__.py +++ b/x2go/backends/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 bf089e0..47a922f 100644 --- a/x2go/backends/control/__init__.py +++ b/x2go/backends/control/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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/plain.py b/x2go/backends/control/plain.py index 5915fb2..5df7c12 100644 --- a/x2go/backends/control/plain.py +++ b/x2go/backends/control/plain.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 bf089e0..47a922f 100644 --- a/x2go/backends/info/__init__.py +++ b/x2go/backends/info/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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/plain.py b/x2go/backends/info/plain.py index b2b5438..40cbf74 100644 --- a/x2go/backends/info/plain.py +++ b/x2go/backends/info/plain.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 bf089e0..47a922f 100644 --- a/x2go/backends/printing/__init__.py +++ b/x2go/backends/printing/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 4268e61..3091724 100644 --- a/x2go/backends/printing/file.py +++ b/x2go/backends/printing/file.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 88fba08..36aabe4 100644 --- a/x2go/backends/printing/gconf.py +++ b/x2go/backends/printing/gconf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 f74c669..4b67211 100644 --- a/x2go/backends/printing/winreg.py +++ b/x2go/backends/printing/winreg.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 e7da2f9..8e0fc92 100644 --- a/x2go/backends/profiles/__init__.py +++ b/x2go/backends/profiles/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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/base.py b/x2go/backends/profiles/base.py index 14f0ea3..dc6731b 100644 --- a/x2go/backends/profiles/base.py +++ b/x2go/backends/profiles/base.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 0c19883..13603d3 100644 --- a/x2go/backends/profiles/file.py +++ b/x2go/backends/profiles/file.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 85bd8c9..0964bdd 100644 --- a/x2go/backends/profiles/gconf.py +++ b/x2go/backends/profiles/gconf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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/httpbroker.py b/x2go/backends/profiles/httpbroker.py index 539bbd9..ed4ac37 100644 --- a/x2go/backends/profiles/httpbroker.py +++ b/x2go/backends/profiles/httpbroker.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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/sshbroker.py b/x2go/backends/profiles/sshbroker.py index 11fbbef..1f31648 100644 --- a/x2go/backends/profiles/sshbroker.py +++ b/x2go/backends/profiles/sshbroker.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 95bc532..f5e245c 100644 --- a/x2go/backends/profiles/winreg.py +++ b/x2go/backends/profiles/winreg.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 bf089e0..47a922f 100644 --- a/x2go/backends/proxy/__init__.py +++ b/x2go/backends/proxy/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 6e24548..bc8f336 100644 --- a/x2go/backends/proxy/base.py +++ b/x2go/backends/proxy/base.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 5b6f8d0..c99de85 100644 --- a/x2go/backends/proxy/nx3.py +++ b/x2go/backends/proxy/nx3.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 @@ -54,7 +54,7 @@ class X2GoProxy(base.X2GoProxy): os.path.join(os.environ["ProgramFiles"], os.path.normpath("PyHoca-GUI/nxproxy/nxproxy.exe")), os.path.join(os.environ["ProgramFiles"], os.path.normpath("x2goclient/nxproxy.exe")), os.path.join(os.environ["ProgramFiles"], os.path.normpath("NX Client for Windows/bin/nxproxy.exe")), - os.path.normpath("../pyhoca-contrib/mswin/nxproxy-mswin/nxproxy-3.5.0.27_cygwin-2014-10-18/nxproxy.exe"), + os.path.normpath("../pyhoca-contrib/mswin/nxproxy-mswin/nxproxy-3.5.0.27_cygwin-2015-10-18/nxproxy.exe"), ] if os.environ.has_key('NXPROXY_BINARY'): _nxproxy_paths.insert(0, os.environ['NXPROXY_BINARY']) diff --git a/x2go/backends/settings/__init__.py b/x2go/backends/settings/__init__.py index bf089e0..47a922f 100644 --- a/x2go/backends/settings/__init__.py +++ b/x2go/backends/settings/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 c484440..afc159e 100644 --- a/x2go/backends/settings/file.py +++ b/x2go/backends/settings/file.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 39d31d4..3dacc46 100644 --- a/x2go/backends/settings/gconf.py +++ b/x2go/backends/settings/gconf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 61eb18d..a294764 100644 --- a/x2go/backends/settings/winreg.py +++ b/x2go/backends/settings/winreg.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 bf089e0..47a922f 100644 --- a/x2go/backends/terminal/__init__.py +++ b/x2go/backends/terminal/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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/plain.py b/x2go/backends/terminal/plain.py index 1239b1e..6c4e924 100644 --- a/x2go/backends/terminal/plain.py +++ b/x2go/backends/terminal/plain.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 609da1c..0d3e663 100644 --- a/x2go/cache.py +++ b/x2go/cache.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 eab4194..e54b8ff 100644 --- a/x2go/checkhosts.py +++ b/x2go/checkhosts.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 9fb708e..244ce6a 100644 --- a/x2go/cleanup.py +++ b/x2go/cleanup.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 d76e46c..6a8ec4d 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 86e31ae..fe36be8 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 c633661..3f2f896 100644 --- a/x2go/forward.py +++ b/x2go/forward.py @@ -1,4 +1,4 @@ -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 309ca88..2415275 100644 --- a/x2go/gevent_subprocess.py +++ b/x2go/gevent_subprocess.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 23365a5..1d5ec7c 100644 --- a/x2go/guardian.py +++ b/x2go/guardian.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 ea554a1..49f01e2 100644 --- a/x2go/inifiles.py +++ b/x2go/inifiles.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 372a887..6bb1799 100644 --- a/x2go/log.py +++ b/x2go/log.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 80b5cae..8d1b68a 100644 --- a/x2go/mimebox.py +++ b/x2go/mimebox.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 b12e9f3..6814cbf 100644 --- a/x2go/mimeboxactions.py +++ b/x2go/mimeboxactions.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 18dc185..b798146 100644 --- a/x2go/printactions.py +++ b/x2go/printactions.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 f8a41d2..85cb81a 100644 --- a/x2go/printqueue.py +++ b/x2go/printqueue.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 de1b767..39129fb 100644 --- a/x2go/pulseaudio.py +++ b/x2go/pulseaudio.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 bb9e788..a01089e 100644 --- a/x2go/registry.py +++ b/x2go/registry.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 fac21b2..0f86139 100644 --- a/x2go/rforward.py +++ b/x2go/rforward.py @@ -1,4 +1,4 @@ -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 a8ff088..46e7389 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 dd378f0..012864b 100644 --- a/x2go/sftpserver.py +++ b/x2go/sftpserver.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 a70f931..331f91d 100644 --- a/x2go/sshproxy.py +++ b/x2go/sshproxy.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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/telekinesis.py b/x2go/telekinesis.py index 684f18e..ca3a788 100644 --- a/x2go/telekinesis.py +++ b/x2go/telekinesis.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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/tests/__init__.py b/x2go/tests/__init__.py index 7b5de7d..3339dfb 100644 --- a/x2go/tests/__init__.py +++ b/x2go/tests/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 # the Free Software Foundation; either version 3 of the License, or diff --git a/x2go/tests/runalltests.py b/x2go/tests/runalltests.py index 60e3a28..0d2fa1d 100644 --- a/x2go/tests/runalltests.py +++ b/x2go/tests/runalltests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 # the Free Software Foundation; either version 3 of the License, or diff --git a/x2go/tests/test_printing.py b/x2go/tests/test_printing.py index 8ac6487..5660fd1 100644 --- a/x2go/tests/test_printing.py +++ b/x2go/tests/test_printing.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 # the Free Software Foundation; either version 3 of the License, or diff --git a/x2go/utils.py b/x2go/utils.py index 8ac3c8a..baf5b27 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 61f21e4..e9e4e93 100644 --- a/x2go/x2go_exceptions.py +++ b/x2go/x2go_exceptions.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 f6d5c55..d11cc56 100644 --- a/x2go/xserver.py +++ b/x2go/xserver.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@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 -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git