From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Tue, 16 Oct 2007 02:57:42 +0000 (-0700)
Subject: setup: stop claiming that we are under GPL in the "license" field of the PyPI database
X-Git-Tag: allmydata-tahoe-0.6.1~4
X-Git-Url: https://git.rkrishnan.org/module-simplejson.encoder.html?a=commitdiff_plain;h=41a5e702765abccab162a9c27c00a023d029eb44;p=tahoe-lafs%2Ftahoe-lafs.git

setup: stop claiming that we are under GPL in the "license" field of the PyPI database
Unfortunately, there is no way to claim that we are under a Free Software/Open
Source licence without also claiming to be under a licence that we are not or
claiming to have approval from DFSG or OSI, which we haven't.

Until now, I erred on the side of choosing the licence that is closest to our
from the list (GPL), but that was a bad idea and now I'm erring on the side of
not including a machine-readable licensing claim at all.

Hopefully humans who are interested will quickly find out that we are actually
under a Real Free Software Licence.

But really, this underscores that we need to talk to FSF, edit our licence for
clarity of intent, and submit it to DFSG/OSI.
---

diff --git a/setup.py b/setup.py
index 143fa427..1fd88f6f 100644
--- a/setup.py
+++ b/setup.py
@@ -37,8 +37,8 @@ trove_classifiers=[
     "Development Status :: 3 - Alpha", 
     "Environment :: Console",
     "Environment :: Web Environment",
-    "License :: OSI Approved :: GNU General Public License (GPL)", 
-    "License :: DFSG approved",
+    "License :: Free Software (GPL variant)", # Not a real acceptable value.  I guess this means we really need to get our licence DFSG/OSI approved.
+    "License :: Open Source (GPL variant)", # Not a real acceptable value.  I guess this means we really need to get our licence DFSG/OSI approved.
     "Intended Audience :: Developers", 
     "Intended Audience :: End Users/Desktop",
     "Intended Audience :: System Administrators",