inveniosoftware · jirikuncar · Aug 6, 2014 · Aug 5, 2014
diff --git a/.coveragerc b/.coveragerc
@@ -1,24 +1,9 @@
-##
 ## This file is part of Flask-SSO
 ## Copyright (C) 2014 CERN.
 ##
-## Flask-SSO is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2 of the
-## License, or (at your option) any later version.
-##
-## Flask-SSO is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Flask-SSO; if not, write to the Free Software Foundation,
-## Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-##
-## In applying this licence, CERN does not waive the privileges and immunities
-## granted to it by virtue of its status as an Intergovernmental Organization
-## or submit itself to any jurisdiction.
+## Flask-SSO is free software; you can redistribute it and/or modify
+## it under the terms of the Revised BSD License; see LICENSE file for
+## more details.
 
 [run]
 source = flask_sso
diff --git a/.travis.yml b/.travis.yml
@@ -3,24 +3,9 @@
 ## This file is part of Flask-SSO
 ## Copyright (C) 2014 CERN.
 ##
-## Flask-SSO is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2 of the
-## License, or (at your option) any later version.
-##
-## Flask-SSO is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Flask-SSO; if not, write to the Free Software Foundation,
-## Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-##
-## In applying this licence, CERN does not waive the privileges and immunities
-## granted to it by virtue of its status as an Intergovernmental Organization
-## or submit itself to any jurisdiction.
-
+## Flask-SSO is free software; you can redistribute it and/or modify
+## it under the terms of the Revised BSD License; see LICENSE file for
+## more details.
 
 # Travis CI file, that integrates with coveralls for reporting test coverage.
 

diff --git a/COPYING b/COPYING
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,38 @@
+Flask-SSO is free software; you can redistribute it and/or modify it
+under the terms of the Revised BSD License quoted below.
+
+Copyright (C) 2013, 2014 CERN.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+In applying this license, CERN does not waive the privileges and
+immunities granted to it by virtue of its status as an
+Intergovernmental Organization or submit itself to any jurisdiction.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -3,25 +3,11 @@
 ## This file is part of Flask-SSO
 ## Copyright (C) 2014 CERN.
 ##
-## Flask-SSO is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2 of the
-## License, or (at your option) any later version.
-##
-## Flask-SSO is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Flask-SSO; if not, write to the Free Software Foundation,
-## Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-##
-## In applying this licence, CERN does not waive the privileges and immunities
-## granted to it by virtue of its status as an Intergovernmental Organization
-## or submit itself to any jurisdiction.
+## Flask-SSO is free software; you can redistribute it and/or modify
+## it under the terms of the Revised BSD License; see LICENSE file for
+## more details.
 
-include COPYING AUTHORS CHANGES README.rst
+include LICENSE AUTHORS CHANGES README.rst
 include .coveragerc run-tests.sh
 include docs/*.rst docs/*.py docs/Makefile
 include tests/*.py

diff --git a/README.rst b/README.rst
@@ -40,15 +40,3 @@ Running the test suite is as simple as: ::
 or, to also show code coverage: ::
 
     ./run-tests.sh
-
-License
-=======
-Copyright (C) 2014 CERN.
-
-Flask-SSO is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-Flask-SSO is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with Flask-SSO; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-
-In applying this licence, CERN does not waive the privileges and immunities granted to it by virtue of its status as an Intergovernmental Organization or submit itself to any jurisdiction.
diff --git a/docs/Makefile b/docs/Makefile
@@ -3,23 +3,9 @@
 ## This file is part of Flask-SSO
 ## Copyright (C) 2014 CERN.
 ##
-## Flask-SSO is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2 of the
-## License, or (at your option) any later version.
-##
-## Flask-SSO is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Flask-SSO; if not, write to the Free Software Foundation,
-## Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-##
-## In applying this licence, CERN does not waive the privileges and immunities
-## granted to it by virtue of its status as an Intergovernmental Organization
-## or submit itself to any jurisdiction.
+## Flask-SSO is free software; you can redistribute it and/or modify
+## it under the terms of the Revised BSD License; see LICENSE file for
+## more details.
 
 # You can set these variables from the command line.
 SPHINXOPTS    =

diff --git a/docs/conf.py b/docs/conf.py
@@ -3,23 +3,9 @@
 ## This file is part of Flask-SSO
 ## Copyright (C) 2014 CERN.
 ##
-## Flask-SSO is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2 of the
-## License, or (at your option) any later version.
-##
-## Flask-SSO is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Flask-SSO; if not, write to the Free Software Foundation,
-## Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-##
-## In applying this licence, CERN does not waive the privileges and immunities
-## granted to it by virtue of its status as an Intergovernmental Organization
-## or submit itself to any jurisdiction.
+## Flask-SSO is free software; you can redistribute it and/or modify
+## it under the terms of the Revised BSD License; see LICENSE file for
+## more details.
 
 import sys
 import os

diff --git a/docs/license.rst b/docs/license.rst
@@ -1,26 +1,8 @@
 License
 =======
 
-Copyright (C) 2014 CERN.
-
-Flask-SSO is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-Flask-SSO is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with Flask-SSO; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-
-In applying this licence, CERN does not waive the privileges and immunities granted to it by virtue of its status as an Intergovernmental Organization or submit itself to any jurisdiction.
-
-The full license text can be found below (:ref:`gpl`).
+.. include:: ../LICENSE
 
 .. _authors:
 
 .. include:: ../AUTHORS
-
-
-.. _gpl:
-
-GNU General Public License
---------------------------
-
-.. include:: ../COPYING
diff --git a/flask_sso/__init__.py b/flask_sso/__init__.py
@@ -3,23 +3,9 @@
 ## This file is part of Flask-SSO
 ## Copyright (C) 2014 CERN.
 ##
-## Flask-SSO is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2 of the
-## License, or (at your option) any later version.
-##
-## Flask-SSO is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Flask-SSO; if not, write to the Free Software Foundation,
-## Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-##
-## In applying this licence, CERN does not waive the privileges and immunities
-## granted to it by virtue of its status as an Intergovernmental Organization
-## or submit itself to any jurisdiction.
+## Flask-SSO is free software; you can redistribute it and/or modify
+## it under the terms of the Revised BSD License; see LICENSE file for
+## more details.
 
 """
 Flask extension

diff --git a/flask_sso/config.py b/flask_sso/config.py
@@ -3,23 +3,9 @@
 ## This file is part of Flask-SSO
 ## Copyright (C) 2014 CERN.
 ##
-## Flask-SSO is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2 of the
-## License, or (at your option) any later version.
-##
-## Flask-SSO is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Flask-SSO; if not, write to the Free Software Foundation,
-## Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-##
-## In applying this licence, CERN does not waive the privileges and immunities
-## granted to it by virtue of its status as an Intergovernmental Organization
-## or submit itself to any jurisdiction.
+## Flask-SSO is free software; you can redistribute it and/or modify
+## it under the terms of the Revised BSD License; see LICENSE file for
+## more details.
 
 """
 Configuration

diff --git a/flask_sso/version.py b/flask_sso/version.py
@@ -3,23 +3,9 @@
 ## This file is part of Flask-SSO
 ## Copyright (C) 2014 CERN.
 ##
-## Flask-SSO is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2 of the
-## License, or (at your option) any later version.
-##
-## Flask-SSO is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Flask-SSO; if not, write to the Free Software Foundation,
-## Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-##
-## In applying this licence, CERN does not waive the privileges and immunities
-## granted to it by virtue of its status as an Intergovernmental Organization
-## or submit itself to any jurisdiction.
+## Flask-SSO is free software; you can redistribute it and/or modify
+## it under the terms of the Revised BSD License; see LICENSE file for
+## more details.
 
 """
 Version information for Flask-SSO

diff --git a/run-tests.sh b/run-tests.sh
@@ -3,22 +3,9 @@
 ## This file is part of Flask-SSO
 ## Copyright (C) 2014 CERN.
 ##
-## Flask-SSO is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2 of the
-## License, or (at your option) any later version.
-##
-## Flask-SSO is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Flask-SSO; if not, write to the Free Software Foundation,
-## Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-##
-## In applying this licence, CERN does not waive the privileges and immunities
-## granted to it by virtue of its status as an Intergovernmental Organization
-## or submit itself to any jurisdiction.
+## Flask-SSO is free software; you can redistribute it and/or modify
+## it under the terms of the Revised BSD License; see LICENSE file for
+## more details.
+
 coverage run setup.py test
 coverage report -m
diff --git a/setup.cfg b/setup.cfg
@@ -3,23 +3,9 @@
 ## This file is part of Flask-SSO
 ## Copyright (C) 2014 CERN.
 ##
-## Flask-SSO is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2 of the
-## License, or (at your option) any later version.
-##
-## Flask-SSO is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Flask-SSO; if not, write to the Free Software Foundation,
-## Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-##
-## In applying this licence, CERN does not waive the privileges and immunities
-## granted to it by virtue of its status as an Intergovernmental Organization
-## or submit itself to any jurisdiction.
+## Flask-SSO is free software; you can redistribute it and/or modify
+## it under the terms of the Revised BSD License; see LICENSE file for
+## more details.
 
 [build_sphinx]
 source-dir = docs/