This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 806224f2caab8db9c7accb7fa4c5e587d34cd5ca Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 12 00:27:11 2014 +0200 Update copyright holders. Copyright is held only by people who actually contributed to the current code base. --- Makefile | 2 -- bin/x2gobroker | 2 -- bin/x2gobroker-daemon | 2 -- bin/x2gobroker-testauth | 2 -- debian/changelog | 2 ++ debian/copyright | 2 -- etc/broker/x2gobroker-authservice-logger.conf | 2 -- etc/broker/x2gobroker-loggers.conf | 2 -- etc/x2gobroker.conf | 2 -- init/x2gobroker-authservice.init | 4 ++-- init/x2gobroker-daemon.init | 2 +- lib/x2gobroker-agent.pl | 1 - 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 | 2 +- x2gobroker/__init__.py | 1 - x2gobroker/agent.py | 2 -- x2gobroker/authmechs/__init__.py | 1 - x2gobroker/authmechs/base_authmech.py | 1 - x2gobroker/authmechs/none_authmech.py | 1 - x2gobroker/authmechs/pam_authmech.py | 1 - x2gobroker/authmechs/testsuite_authmech.py | 1 - x2gobroker/authservice.py | 2 -- x2gobroker/basicauth.py | 2 -- x2gobroker/brokers/base_broker.py | 2 +- x2gobroker/brokers/inifile_broker.py | 1 - x2gobroker/brokers/zeroconf_broker.py | 1 - x2gobroker/client/__init__.py | 1 - x2gobroker/client/plain.py | 2 -- x2gobroker/defaults.py | 2 -- x2gobroker/loggers.py | 2 -- x2gobroker/nameservices/base_nameservice.py | 1 - x2gobroker/nameservices/libnss_nameservice.py | 1 - x2gobroker/nameservices/testsuite_nameservice.py | 1 - x2gobroker/optional_scripts/__init__.py | 2 +- x2gobroker/optional_scripts/base_script.py | 2 +- x2gobroker/uccsjson.py | 2 -- x2gobroker/utils.py | 2 -- x2gobroker/web/extras.py | 2 -- x2gobroker/web/json.py | 2 -- x2gobroker/web/plain.py | 2 -- x2gobroker/web/uccs.py | 2 -- x2gobroker/x2gobroker_exceptions.py | 1 - 49 files changed, 9 insertions(+), 77 deletions(-) diff --git a/Makefile b/Makefile index b1dba91..37d4c9b 100755 --- a/Makefile +++ b/Makefile @@ -1,8 +1,6 @@ #!/usr/bin/make -f # 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) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/bin/x2gobroker b/bin/x2gobroker index f9c878f..0080fbe 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -2,8 +2,6 @@ # -*- coding: utf-8 -*- # 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) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/bin/x2gobroker-daemon b/bin/x2gobroker-daemon index ca15948..2ea3ce3 100755 --- a/bin/x2gobroker-daemon +++ b/bin/x2gobroker-daemon @@ -2,8 +2,6 @@ # -*- coding: utf-8 -*- # 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) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/bin/x2gobroker-testauth b/bin/x2gobroker-testauth index f7a1034..fd844d9 100755 --- a/bin/x2gobroker-testauth +++ b/bin/x2gobroker-testauth @@ -1,8 +1,6 @@ #!/usr/bin/env python # 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) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/debian/changelog b/debian/changelog index 87cfaaa..999965b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -158,6 +158,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low up in a rewrite of the complete selection_session() method of the base broker code. - Update README and TODO. + - Update copyright holders. Copyright is held only by people who actually + contributed to the current code base. * debian/control: + Provide separate bin:package for SSH brokerage: x2gobroker-ssh. + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/debian/copyright b/debian/copyright index fdf8b88..df887bd 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,8 +8,6 @@ Source: http://code.x2go.org/releases/source/x2gobroker Files: * Copyright: 2012, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> - 2012, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> - 2012, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> License: AGPL-3+ Files: debian/* diff --git a/etc/broker/x2gobroker-authservice-logger.conf b/etc/broker/x2gobroker-authservice-logger.conf index 3c8c99f..3299769 100644 --- a/etc/broker/x2gobroker-authservice-logger.conf +++ b/etc/broker/x2gobroker-authservice-logger.conf @@ -1,6 +1,4 @@ # 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) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/etc/broker/x2gobroker-loggers.conf b/etc/broker/x2gobroker-loggers.conf index dd56a24..8fac596 100644 --- a/etc/broker/x2gobroker-loggers.conf +++ b/etc/broker/x2gobroker-loggers.conf @@ -1,6 +1,4 @@ # 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) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index e6a2f30..b6ed8a8 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -1,6 +1,4 @@ # 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) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/init/x2gobroker-authservice.init b/init/x2gobroker-authservice.init index 5f5e24a..074faa8 100755 --- a/init/x2gobroker-authservice.init +++ b/init/x2gobroker-authservice.init @@ -2,8 +2,8 @@ # # Start the X2Go Session Broker PAM Authentication Service # -# Copyright © 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Distributable under the terms of the GNU AGPL version 2. +# Copyright © 2014 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Distributable under the terms of the GNU AGPL version 3+. # ### BEGIN INIT INFO # Provides: x2gobroker-authservice diff --git a/init/x2gobroker-daemon.init b/init/x2gobroker-daemon.init index c8094fd..1e26dc5 100755 --- a/init/x2gobroker-daemon.init +++ b/init/x2gobroker-daemon.init @@ -3,7 +3,7 @@ # Start the X2Go Session Broker standalone daemon # # Copyright © 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Distributable under the terms of the GNU AGPL version 2. +# Distributable under the terms of the GNU AGPL version 3+. # ### BEGIN INIT INFO # Provides: x2gobroker-daemon diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index ec8ca58..d670895 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -2,7 +2,6 @@ # 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) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/sbin/x2gobroker-authservice b/sbin/x2gobroker-authservice index e29d84b..318c2f0 100755 --- a/sbin/x2gobroker-authservice +++ b/sbin/x2gobroker-authservice @@ -2,8 +2,6 @@ # -*- coding: utf-8 -*- # 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) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/sbin/x2gobroker-daemon-debug b/sbin/x2gobroker-daemon-debug index 3a82453..5a0da3c 100755 --- a/sbin/x2gobroker-daemon-debug +++ b/sbin/x2gobroker-daemon-debug @@ -2,8 +2,6 @@ # -*- coding: utf-8 -*- # 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) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/sbin/x2gobroker-keygen b/sbin/x2gobroker-keygen index 9be0708..d839c5a 100755 --- a/sbin/x2gobroker-keygen +++ b/sbin/x2gobroker-keygen @@ -2,8 +2,6 @@ # -*- coding: utf-8 -*- # 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) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer index 1995d95..6029792 100755 --- a/sbin/x2gobroker-pubkeyauthorizer +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -2,8 +2,6 @@ # -*- coding: utf-8 -*- # 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) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/sbin/x2gobroker-testagent b/sbin/x2gobroker-testagent index e927225..8dc527b 100755 --- a/sbin/x2gobroker-testagent +++ b/sbin/x2gobroker-testagent @@ -1,8 +1,6 @@ #!/usr/bin/env python # 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) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/setup.py b/setup.py index cc9a703..e51112d 100755 --- a/setup.py +++ b/setup.py @@ -4,8 +4,6 @@ # -*- 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-2014 by Heinz-M. Graesing <heint-m.graesing@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/src/x2gobroker-agent.c b/src/x2gobroker-agent.c index 3337d3b..e281275 100644 --- a/src/x2gobroker-agent.c +++ b/src/x2gobroker-agent.c @@ -1,7 +1,5 @@ /* * This file is part of the X2Go Project - http://www.x2go.org - * Copyright (C) 2011-2014 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> - * Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> * Copyright (C) 2012-2014 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> * * This program is free software; you can redistribute it and/or modify diff --git a/src/x2gobroker-ssh.c b/src/x2gobroker-ssh.c index 81a4ecc..57af49f 100644 --- a/src/x2gobroker-ssh.c +++ b/src/x2gobroker-ssh.c @@ -1,7 +1,5 @@ /* * This file is part of the X2Go Project - http://www.x2go.org - * Copyright (C) 2011-2014 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> - * Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> * Copyright (C) 2012-2014 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> * * This program is free software; you can redistribute it and/or modify diff --git a/test.py b/test.py index b04e9ee..0276f24 100755 --- a/test.py +++ b/test.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2014 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/__init__.py b/x2gobroker/__init__.py index ea8e638..ec5fce9 100644 --- a/x2gobroker/__init__.py +++ b/x2gobroker/__init__.py @@ -1,7 +1,6 @@ # -*- 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> # # 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/agent.py b/x2gobroker/agent.py index ebca7d6..a253f94 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -1,8 +1,6 @@ # -*- 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-2014 by Heinz-Markus Graesing <heinz-m.graesing@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/authmechs/__init__.py b/x2gobroker/authmechs/__init__.py index d3eff3c..e9d0a51 100644 --- a/x2gobroker/authmechs/__init__.py +++ b/x2gobroker/authmechs/__init__.py @@ -1,7 +1,6 @@ # -*- 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> # # 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 f8206af..2040ebf 100644 --- a/x2gobroker/authmechs/base_authmech.py +++ b/x2gobroker/authmechs/base_authmech.py @@ -1,7 +1,6 @@ # -*- 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> # # 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 6535f4b..0ce96ce 100644 --- a/x2gobroker/authmechs/none_authmech.py +++ b/x2gobroker/authmechs/none_authmech.py @@ -1,7 +1,6 @@ # -*- 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> # # 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 9e7b85b..4679e75 100644 --- a/x2gobroker/authmechs/pam_authmech.py +++ b/x2gobroker/authmechs/pam_authmech.py @@ -1,7 +1,6 @@ # -*- 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> # # 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 2df02c4..890a96d 100644 --- a/x2gobroker/authmechs/testsuite_authmech.py +++ b/x2gobroker/authmechs/testsuite_authmech.py @@ -1,7 +1,6 @@ # -*- 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> # # 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 7120fbc..457d898 100644 --- a/x2gobroker/authservice.py +++ b/x2gobroker/authservice.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- # 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) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/x2gobroker/basicauth.py b/x2gobroker/basicauth.py index 0890ed9..6b33c75 100644 --- a/x2gobroker/basicauth.py +++ b/x2gobroker/basicauth.py @@ -1,8 +1,6 @@ #!/usr/bin/env python # 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) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index ea48f77..928550b 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 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2012-2014 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 18341bf..ca0dc44 100644 --- a/x2gobroker/brokers/inifile_broker.py +++ b/x2gobroker/brokers/inifile_broker.py @@ -1,7 +1,6 @@ # -*- 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> # # 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 2e252ac..00b3fd7 100644 --- a/x2gobroker/brokers/zeroconf_broker.py +++ b/x2gobroker/brokers/zeroconf_broker.py @@ -1,7 +1,6 @@ # -*- 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> # # 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 d3eff3c..e9d0a51 100644 --- a/x2gobroker/client/__init__.py +++ b/x2gobroker/client/__init__.py @@ -1,7 +1,6 @@ # -*- 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> # # 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 d10ae3e..2cf39d6 100644 --- a/x2gobroker/client/plain.py +++ b/x2gobroker/client/plain.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- # 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) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index e4d95ac..9451d4b 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -1,8 +1,6 @@ # -*- 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-2014 by Heinz-Markus Graesing <heinz-m.graesing@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/loggers.py b/x2gobroker/loggers.py index edaaabe..c4b77df 100644 --- a/x2gobroker/loggers.py +++ b/x2gobroker/loggers.py @@ -1,8 +1,6 @@ # -*- 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-2014 by Heinz-Markus Graesing <heinz-m.graesing@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 d4c042d..33e7e1a 100644 --- a/x2gobroker/nameservices/base_nameservice.py +++ b/x2gobroker/nameservices/base_nameservice.py @@ -1,7 +1,6 @@ # -*- 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> # # 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 a864e81..8889d87 100644 --- a/x2gobroker/nameservices/libnss_nameservice.py +++ b/x2gobroker/nameservices/libnss_nameservice.py @@ -1,7 +1,6 @@ # -*- 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> # # 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 a7e3a68..4dd79f3 100644 --- a/x2gobroker/nameservices/testsuite_nameservice.py +++ b/x2gobroker/nameservices/testsuite_nameservice.py @@ -1,7 +1,6 @@ # -*- 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> # # 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 d3eff3c..5bf61f0 100755 --- a/x2gobroker/optional_scripts/__init__.py +++ b/x2gobroker/optional_scripts/__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) 2014 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/optional_scripts/base_script.py b/x2gobroker/optional_scripts/base_script.py index dd9e5e2..f9ac33f 100755 --- a/x2gobroker/optional_scripts/base_script.py +++ b/x2gobroker/optional_scripts/base_script.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) 2014 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/uccsjson.py b/x2gobroker/uccsjson.py index 726b52d..17ee82c 100644 --- a/x2gobroker/uccsjson.py +++ b/x2gobroker/uccsjson.py @@ -1,8 +1,6 @@ # -*- 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-2014 by Heinz-Markus Graesing <heinz-m.graesing@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/utils.py b/x2gobroker/utils.py index f296b03..bcb9e2a 100644 --- a/x2gobroker/utils.py +++ b/x2gobroker/utils.py @@ -1,8 +1,6 @@ # -*- 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-2014 by Heinz-Markus Graesing <heinz-m.graesing@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 4c5afcb..b90f936 100644 --- a/x2gobroker/web/extras.py +++ b/x2gobroker/web/extras.py @@ -1,8 +1,6 @@ #!/usr/bin/env python # 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) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/x2gobroker/web/json.py b/x2gobroker/web/json.py index 02f4846..298082d 100644 --- a/x2gobroker/web/json.py +++ b/x2gobroker/web/json.py @@ -1,8 +1,6 @@ #!/usr/bin/env python # 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) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index be4a81d..9ed7b52 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -1,8 +1,6 @@ #!/usr/bin/env python # 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) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py index 87dc64a..fa182eb 100644 --- a/x2gobroker/web/uccs.py +++ b/x2gobroker/web/uccs.py @@ -1,8 +1,6 @@ #!/usr/bin/env python # 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) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/x2gobroker/x2gobroker_exceptions.py b/x2gobroker/x2gobroker_exceptions.py index 5212e20..7a5a6c1 100644 --- a/x2gobroker/x2gobroker_exceptions.py +++ b/x2gobroker/x2gobroker_exceptions.py @@ -1,7 +1,6 @@ # -*- 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> # # 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