From fcc1330318dbd818659eed9a8422b85438289fb1 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Tue, 4 Nov 2014 12:02:30 +0530 Subject: [PATCH] Relicense __main__.py to AGPLv3+ - There is no point in keeping this one single file as with different license from the rest of the package. This change simplifies things. - The file has been almost entirely been rewritten for Django, module loading, CherryPy static directories etc. - This change will be pushed with the consent of new authors: fonfon and Me. --- LICENSES | 1 - plinth/__main__.py | 25 +++++++++++++++++-------- setup.py | 1 - 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/LICENSES b/LICENSES index b719f43d2..f71a5f59d 100644 --- a/LICENSES +++ b/LICENSES @@ -32,7 +32,6 @@ specified and linked otherwise. - doc/scripts.mdwn :: - - doc/security.mdwn :: - - doc/themes.mdwn :: - -- plinth/__main__.py :: [[file:plinth.py::__license__%20%3D%20"GPLv3%20or%20later"]["GPLv3 or later"]] - plinth/actions.py :: - - plinth/cfg.py :: - - plinth/logger.py :: - diff --git a/plinth/__main__.py b/plinth/__main__.py index f52cab521..f9854ce36 100644 --- a/plinth/__main__.py +++ b/plinth/__main__.py @@ -1,4 +1,20 @@ -#!/usr/bin/python +#!/usr/bin/python3 +# +# This file is part of Plinth. +# +# 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 the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# import argparse import django.conf @@ -17,13 +33,6 @@ from plinth import cfg from plinth import module_loader from plinth import service -__author__ = "James Vasile" -__copyright__ = "Copyright 2011-2013, James Vasile" -__license__ = "GPLv3 or later" -__maintainer__ = "James Vasile" -__email__ = "james@jamesvasile.com" -__status__ = "Development" - LOGGER = logging.getLogger(__name__) diff --git a/setup.py b/setup.py index 85c8806c3..e71b06273 100755 --- a/setup.py +++ b/setup.py @@ -101,7 +101,6 @@ setuptools.setup( 'Intended Audience :: End Users/Desktop', 'License :: DFSG approved', 'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)', - 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', 'Natural Language :: English', 'Operating System :: POSIX :: Linux', 'Programming Language :: Python',