This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 26fc67dfda133d9f41872041e9f355e7c2ab002d Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jan 9 03:26:05 2015 +0100 common: update copyright notices, whitespace fixes. Happy new year! --- Makefile | 2 +- bin/x2gobroker | 2 +- bin/x2gobroker-testauth | 2 +- debian/copyright | 8 ++++---- debian/rules | 2 +- etc/broker/x2gobroker-authservice-logger.conf | 2 +- etc/broker/x2gobroker-loggers.conf | 2 +- etc/x2gobroker.conf | 2 +- init/x2gobroker-daemon.init | 2 +- lib/x2gobroker-agent.pl | 4 ++-- sbin/x2gobroker-authservice | 2 +- sbin/x2gobroker-daemon-debug | 2 +- sbin/x2gobroker-keygen | 2 +- sbin/x2gobroker-pubkeyauthorizer | 2 +- sbin/x2gobroker-testagent | 2 +- setup.py | 2 +- src/x2gobroker-agent.c | 2 +- src/x2gobroker-ssh.c | 2 +- test.py | 4 ++-- x2gobroker/__init__.py | 2 +- x2gobroker/_paramiko.py | 2 +- x2gobroker/agent.py | 2 +- x2gobroker/authmechs/__init__.py | 2 +- x2gobroker/authmechs/base_authmech.py | 2 +- x2gobroker/authmechs/https_get_authmech.py | 4 ++-- x2gobroker/authmechs/none_authmech.py | 2 +- x2gobroker/authmechs/pam_authmech.py | 2 +- x2gobroker/authmechs/testsuite_authmech.py | 2 +- x2gobroker/authservice.py | 2 +- x2gobroker/basicauth.py | 2 +- x2gobroker/brokers/__init__.py | 4 ++-- x2gobroker/brokers/base_broker.py | 4 ++-- x2gobroker/brokers/inifile_broker.py | 2 +- x2gobroker/brokers/zeroconf_broker.py | 2 +- x2gobroker/client/__init__.py | 2 +- x2gobroker/client/plain.py | 2 +- x2gobroker/config.py | 2 +- x2gobroker/defaults.py | 2 +- x2gobroker/loggers.py | 2 +- x2gobroker/nameservices/__init__.py | 4 ++-- x2gobroker/nameservices/base_nameservice.py | 2 +- x2gobroker/nameservices/libnss_nameservice.py | 2 +- x2gobroker/nameservices/testsuite_nameservice.py | 2 +- x2gobroker/optional_scripts/__init__.py | 2 +- x2gobroker/optional_scripts/base_script.py | 2 +- x2gobroker/tests/__init__.py | 4 ++-- x2gobroker/tests/runalltests.py | 2 +- x2gobroker/tests/test_broker_agent.py | 2 +- x2gobroker/tests/test_broker_base.py | 2 +- x2gobroker/tests/test_broker_inifile.py | 2 +- x2gobroker/tests/test_broker_zeroconf.py | 2 +- x2gobroker/tests/test_client_plain_base.py | 2 +- x2gobroker/tests/test_utils.py | 2 +- x2gobroker/tests/test_web_plain_base.py | 2 +- x2gobroker/tests/test_web_plain_inifile.py | 2 +- x2gobroker/tests/test_web_plain_zeroconf.py | 2 +- x2gobroker/tests/test_web_uccs_zeroconf.py | 2 +- x2gobroker/uccsjson.py | 2 +- x2gobroker/utils.py | 2 +- x2gobroker/web/__init__.py | 4 ++-- x2gobroker/web/extras.py | 2 +- x2gobroker/web/json.py | 2 +- x2gobroker/web/plain.py | 2 +- x2gobroker/web/uccs.py | 2 +- x2gobroker/x2gobroker_exceptions.py | 2 +- 65 files changed, 76 insertions(+), 76 deletions(-) diff --git a/Makefile b/Makefile index 13ca432..49e4da6 100755 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make -f # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/bin/x2gobroker b/bin/x2gobroker index 95eccd7..005bfc4 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/bin/x2gobroker-testauth b/bin/x2gobroker-testauth index ca15f6f..0c5e9d1 100755 --- a/bin/x2gobroker-testauth +++ b/bin/x2gobroker-testauth @@ -1,7 +1,7 @@ #!/usr/bin/env python # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/debian/copyright b/debian/copyright index df887bd..cda5732 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,17 +6,17 @@ Upstream-Contact: Source: http://code.x2go.org/releases/source/x2gobroker Files: * -Copyright: - 2012, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Copyright: + 2012-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: AGPL-3+ Files: debian/* -Copyright: 2012, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Copyright: 2012-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: AGPL-3+ License: AGPL-3+ This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published + 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. . diff --git a/debian/rules b/debian/rules index 3b69310..a899e11 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # This program 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/etc/broker/x2gobroker-authservice-logger.conf b/etc/broker/x2gobroker-authservice-logger.conf index 3299769..415b0d8 100644 --- a/etc/broker/x2gobroker-authservice-logger.conf +++ b/etc/broker/x2gobroker-authservice-logger.conf @@ -1,5 +1,5 @@ # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/etc/broker/x2gobroker-loggers.conf b/etc/broker/x2gobroker-loggers.conf index 8fac596..7a84092 100644 --- a/etc/broker/x2gobroker-loggers.conf +++ b/etc/broker/x2gobroker-loggers.conf @@ -1,5 +1,5 @@ # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/etc/x2gobroker.conf b/etc/x2gobroker.conf index 199ff0c..1901673 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -1,5 +1,5 @@ # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/init/x2gobroker-daemon.init b/init/x2gobroker-daemon.init index 1e26dc5..5639484 100755 --- a/init/x2gobroker-daemon.init +++ b/init/x2gobroker-daemon.init @@ -2,7 +2,7 @@ # # Start the X2Go Session Broker standalone daemon # -# Copyright © 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright © 2012-2015 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # Distributable under the terms of the GNU AGPL version 3+. # ### BEGIN INIT INFO diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index c6fe172..242f78a 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -1,8 +1,8 @@ #!/usr/bin/perl -XU # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2011-2015 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/sbin/x2gobroker-authservice b/sbin/x2gobroker-authservice index b83c71c..8eb0ade 100755 --- a/sbin/x2gobroker-authservice +++ b/sbin/x2gobroker-authservice @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/sbin/x2gobroker-daemon-debug b/sbin/x2gobroker-daemon-debug index 5a0da3c..580bbdb 100755 --- a/sbin/x2gobroker-daemon-debug +++ b/sbin/x2gobroker-daemon-debug @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/sbin/x2gobroker-keygen b/sbin/x2gobroker-keygen index d839c5a..c3aa03c 100755 --- a/sbin/x2gobroker-keygen +++ b/sbin/x2gobroker-keygen @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer index 6029792..8a85e3b 100755 --- a/sbin/x2gobroker-pubkeyauthorizer +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/sbin/x2gobroker-testagent b/sbin/x2gobroker-testagent index 8dc527b..24623f6 100755 --- a/sbin/x2gobroker-testagent +++ b/sbin/x2gobroker-testagent @@ -1,7 +1,7 @@ #!/usr/bin/env python # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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 e51112d..d83c902 100755 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/src/x2gobroker-agent.c b/src/x2gobroker-agent.c index e281275..41b9463 100644 --- a/src/x2gobroker-agent.c +++ b/src/x2gobroker-agent.c @@ -1,6 +1,6 @@ /* * This file is part of the X2Go Project - http://www.x2go.org - * Copyright (C) 2012-2014 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + * Copyright (C) 2012-2015 Mike Gabriel <mike.gabriel@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 diff --git a/src/x2gobroker-ssh.c b/src/x2gobroker-ssh.c index 57af49f..40d4629 100644 --- a/src/x2gobroker-ssh.c +++ b/src/x2gobroker-ssh.c @@ -1,6 +1,6 @@ /* * This file is part of the X2Go Project - http://www.x2go.org - * Copyright (C) 2012-2014 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + * Copyright (C) 2012-2015 Mike Gabriel <mike.gabriel@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 diff --git a/test.py b/test.py index 0276f24..04a90ce 100755 --- a/test.py +++ b/test.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# +# Copyright (C) 2014-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# # X2Go Session Broker 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/x2gobroker/__init__.py b/x2gobroker/__init__.py index ec5fce9..f4d0d10 100644 --- a/x2gobroker/__init__.py +++ b/x2gobroker/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/_paramiko.py b/x2gobroker/_paramiko.py index acf89ca..569532a 100644 --- a/x2gobroker/_paramiko.py +++ b/x2gobroker/_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/x2gobroker/agent.py b/x2gobroker/agent.py index 9281f12..5364825 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/authmechs/__init__.py b/x2gobroker/authmechs/__init__.py index e9d0a51..afa803f 100644 --- a/x2gobroker/authmechs/__init__.py +++ b/x2gobroker/authmechs/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/authmechs/base_authmech.py b/x2gobroker/authmechs/base_authmech.py index 2040ebf..f0531a1 100644 --- a/x2gobroker/authmechs/base_authmech.py +++ b/x2gobroker/authmechs/base_authmech.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/authmechs/https_get_authmech.py b/x2gobroker/authmechs/https_get_authmech.py index c5446fa..dc5a085 100644 --- a/x2gobroker/authmechs/https_get_authmech.py +++ b/x2gobroker/authmechs/https_get_authmech.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Josh Lukens <jlukens@botch.com> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Josh Lukens <jlukens@botch.com> # # X2Go Session Broker 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/x2gobroker/authmechs/none_authmech.py b/x2gobroker/authmechs/none_authmech.py index 0ce96ce..cac0b6e 100644 --- a/x2gobroker/authmechs/none_authmech.py +++ b/x2gobroker/authmechs/none_authmech.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/authmechs/pam_authmech.py b/x2gobroker/authmechs/pam_authmech.py index 4679e75..9e992fa 100644 --- a/x2gobroker/authmechs/pam_authmech.py +++ b/x2gobroker/authmechs/pam_authmech.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/authmechs/testsuite_authmech.py b/x2gobroker/authmechs/testsuite_authmech.py index 890a96d..4c36f6a 100644 --- a/x2gobroker/authmechs/testsuite_authmech.py +++ b/x2gobroker/authmechs/testsuite_authmech.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/authservice.py b/x2gobroker/authservice.py index d6f8919..93e3e42 100644 --- a/x2gobroker/authservice.py +++ b/x2gobroker/authservice.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/basicauth.py b/x2gobroker/basicauth.py index 2c8a846..a943719 100644 --- a/x2gobroker/basicauth.py +++ b/x2gobroker/basicauth.py @@ -1,5 +1,5 @@ # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/brokers/__init__.py b/x2gobroker/brokers/__init__.py index d3eff3c..9c332b4 100644 --- a/x2gobroker/brokers/__init__.py +++ b/x2gobroker/brokers/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # # X2Go Session Broker 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/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index a8d0ffb..49042ec 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Josh Lukens <jlukens@botch.com> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Josh Lukens <jlukens@botch.com> # # X2Go Session Broker 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/x2gobroker/brokers/inifile_broker.py b/x2gobroker/brokers/inifile_broker.py index d334168..a110ba7 100644 --- a/x2gobroker/brokers/inifile_broker.py +++ b/x2gobroker/brokers/inifile_broker.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/brokers/zeroconf_broker.py b/x2gobroker/brokers/zeroconf_broker.py index 00b3fd7..a71fca9 100644 --- a/x2gobroker/brokers/zeroconf_broker.py +++ b/x2gobroker/brokers/zeroconf_broker.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/client/__init__.py b/x2gobroker/client/__init__.py index e9d0a51..afa803f 100644 --- a/x2gobroker/client/__init__.py +++ b/x2gobroker/client/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/client/plain.py b/x2gobroker/client/plain.py index 2cf39d6..4b0dece 100644 --- a/x2gobroker/client/plain.py +++ b/x2gobroker/client/plain.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/config.py b/x2gobroker/config.py index fc1fe60..33d4c0c 100644 --- a/x2gobroker/config.py +++ b/x2gobroker/config.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> # # X2Go Session Broker 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/x2gobroker/defaults.py b/x2gobroker/defaults.py index 55cc287..c7d4dbf 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/loggers.py b/x2gobroker/loggers.py index c575e70..8f4271e 100644 --- a/x2gobroker/loggers.py +++ b/x2gobroker/loggers.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/nameservices/__init__.py b/x2gobroker/nameservices/__init__.py index d3eff3c..9c332b4 100644 --- a/x2gobroker/nameservices/__init__.py +++ b/x2gobroker/nameservices/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # # X2Go Session Broker 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/x2gobroker/nameservices/base_nameservice.py b/x2gobroker/nameservices/base_nameservice.py index 33e7e1a..b055800 100644 --- a/x2gobroker/nameservices/base_nameservice.py +++ b/x2gobroker/nameservices/base_nameservice.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/nameservices/libnss_nameservice.py b/x2gobroker/nameservices/libnss_nameservice.py index 8889d87..03e02ab 100644 --- a/x2gobroker/nameservices/libnss_nameservice.py +++ b/x2gobroker/nameservices/libnss_nameservice.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/nameservices/testsuite_nameservice.py b/x2gobroker/nameservices/testsuite_nameservice.py index 4dd79f3..375960c 100644 --- a/x2gobroker/nameservices/testsuite_nameservice.py +++ b/x2gobroker/nameservices/testsuite_nameservice.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/optional_scripts/__init__.py b/x2gobroker/optional_scripts/__init__.py index 5bf61f0..78d3433 100755 --- a/x2gobroker/optional_scripts/__init__.py +++ b/x2gobroker/optional_scripts/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # Copyright (C) 2014 by Josh Lukens <jlukens@botch.com> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/x2gobroker/optional_scripts/base_script.py b/x2gobroker/optional_scripts/base_script.py index f9ac33f..37c95dd 100755 --- a/x2gobroker/optional_scripts/base_script.py +++ b/x2gobroker/optional_scripts/base_script.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # Copyright (C) 2014 by Josh Lukens <jlukens@botch.com> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/x2gobroker/tests/__init__.py b/x2gobroker/tests/__init__.py index 2ae9ac5..cf54635 100644 --- a/x2gobroker/tests/__init__.py +++ b/x2gobroker/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> +# # X2Go Session Broker 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/x2gobroker/tests/runalltests.py b/x2gobroker/tests/runalltests.py index 1aa49d1..761e495 100644 --- a/x2gobroker/tests/runalltests.py +++ b/x2gobroker/tests/runalltests.py @@ -1,6 +1,6 @@ # -*- 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> # # X2Go Session Broker 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/x2gobroker/tests/test_broker_agent.py b/x2gobroker/tests/test_broker_agent.py index 36c7b70..795ea94 100644 --- a/x2gobroker/tests/test_broker_agent.py +++ b/x2gobroker/tests/test_broker_agent.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/tests/test_broker_base.py b/x2gobroker/tests/test_broker_base.py index 4d3cea5..2af14a4 100644 --- a/x2gobroker/tests/test_broker_base.py +++ b/x2gobroker/tests/test_broker_base.py @@ -1,5 +1,5 @@ -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/tests/test_broker_inifile.py b/x2gobroker/tests/test_broker_inifile.py index c05aa2e..4ebaf1a 100644 --- a/x2gobroker/tests/test_broker_inifile.py +++ b/x2gobroker/tests/test_broker_inifile.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/tests/test_broker_zeroconf.py b/x2gobroker/tests/test_broker_zeroconf.py index e51105b..bbdfc34 100644 --- a/x2gobroker/tests/test_broker_zeroconf.py +++ b/x2gobroker/tests/test_broker_zeroconf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/tests/test_client_plain_base.py b/x2gobroker/tests/test_client_plain_base.py index d13cfbe..432287c 100644 --- a/x2gobroker/tests/test_client_plain_base.py +++ b/x2gobroker/tests/test_client_plain_base.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/tests/test_utils.py b/x2gobroker/tests/test_utils.py index 3335f81..b60d0dc 100644 --- a/x2gobroker/tests/test_utils.py +++ b/x2gobroker/tests/test_utils.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/tests/test_web_plain_base.py b/x2gobroker/tests/test_web_plain_base.py index 92727e3..7a4c038 100644 --- a/x2gobroker/tests/test_web_plain_base.py +++ b/x2gobroker/tests/test_web_plain_base.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/tests/test_web_plain_inifile.py b/x2gobroker/tests/test_web_plain_inifile.py index dcb3185..afa4eb1 100644 --- a/x2gobroker/tests/test_web_plain_inifile.py +++ b/x2gobroker/tests/test_web_plain_inifile.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/tests/test_web_plain_zeroconf.py b/x2gobroker/tests/test_web_plain_zeroconf.py index 8da9a48..f805aa4 100644 --- a/x2gobroker/tests/test_web_plain_zeroconf.py +++ b/x2gobroker/tests/test_web_plain_zeroconf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/tests/test_web_uccs_zeroconf.py b/x2gobroker/tests/test_web_uccs_zeroconf.py index 4b3732d..e1e5782 100644 --- a/x2gobroker/tests/test_web_uccs_zeroconf.py +++ b/x2gobroker/tests/test_web_uccs_zeroconf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/uccsjson.py b/x2gobroker/uccsjson.py index 17ee82c..ddf1a6c 100644 --- a/x2gobroker/uccsjson.py +++ b/x2gobroker/uccsjson.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/utils.py b/x2gobroker/utils.py index 9d02c47..efa4a80 100644 --- a/x2gobroker/utils.py +++ b/x2gobroker/utils.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/web/__init__.py b/x2gobroker/web/__init__.py index d3eff3c..9c332b4 100644 --- a/x2gobroker/web/__init__.py +++ b/x2gobroker/web/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # # X2Go Session Broker 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/x2gobroker/web/extras.py b/x2gobroker/web/extras.py index bcf1464..a1cf953 100644 --- a/x2gobroker/web/extras.py +++ b/x2gobroker/web/extras.py @@ -1,5 +1,5 @@ # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/web/json.py b/x2gobroker/web/json.py index a5c6fc0..1288928 100644 --- a/x2gobroker/web/json.py +++ b/x2gobroker/web/json.py @@ -1,5 +1,5 @@ # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index 3bc6266..591fbc9 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -1,5 +1,5 @@ # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py index deea684..7a6dc8c 100644 --- a/x2gobroker/web/uccs.py +++ b/x2gobroker/web/uccs.py @@ -1,5 +1,5 @@ # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker/x2gobroker_exceptions.py b/x2gobroker/x2gobroker_exceptions.py index 7a5a6c1..01af933 100644 --- a/x2gobroker/x2gobroker_exceptions.py +++ b/x2gobroker/x2gobroker_exceptions.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker 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/x2gobroker.git