Merge remote branch 'remotes/willkg/459_lgpl'

13 files changed, 336 insertions, 23 deletions

diff --git a/COPYING b/COPYING
index fc930ccb..6895d3b8 100644
--- a/COPYING
+++ b/COPYING
@@ -2,30 +2,56 @@
  COPYING
 =========
 
-GNU MediaGoblin is composed of the following kinds of files:
+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.
 
-* software files: Python, JavaScript and HTML templates
-* non-software data: CSS, images, and video
-* documentation
+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, in the file ``licenses/AGPLv3.txt``.
+If not, see <http://www.gnu.org/licenses/>.
 
-Software files
-==============
 
-Python, JavaScript, and template files files are released under the 
-AGPL v3.  The text of this license is located in ``AGPLv3.txt``.
+JavaScript files located in the ``mediagoblin/`` directory tree of
+are free software: you can redistribute and/or modify them under the
+terms of the GNU Lesser General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
+You should have received a copy of the GNU Lesser General Public
+License along with this program, in the file ``licenses/LGPLv3.txt``.
+If not, see <http://www.gnu.org/licenses/>.
 
-Non-software data
-=================
 
-CSS, images and video are all released under a CC0 license.  The text 
-of this license is located in ``CC0_1.0.txt``.
+Documentation files located in the ``docs/`` directory tree are released
+under a CC0 license.  To the extent possible under law, the author(s)
+have dedicated all copyright and related and neighboring rights to these
+files to the public domain worldwide.  These files are distributed
+without any warranty. 
 
+You should have received a copy of the CC0 license in the file 
+``licenses/CC0_1.0.txt``.  If not, see 
+<http://creativecommons.org/publicdomain/zero/1.0/>.
 
-Documentation
-=============
 
-All documentation is under the ``docs/`` directory.  These materials
-are all released under a CC0 license.  The text of this license is
-located in ``CC0_1.0.txt``.
+CSS, images and video located in the ``mediagoblin/`` directory tree are
+released under a CC0 license.  To the extent possible under law, the author(s)
+have dedicated all copyright and related and neighboring rights to these
+files to the public domain worldwide.  These files are distributed without
+any warranty. 
+
+You should have received a copy of the CC0 license in the file 
+``licenses/CC0_1.0.txt``.  If not, see 
+<http://creativecommons.org/publicdomain/zero/1.0/>.
+
+
+Additional library software has been made available in the ``extlib/``
+directory.  All of it is Free Software and can be distributed under
+liberal terms, but those terms may differ in detail from the AGPL's
+particulars.  See each package's license file in the extlib directory
+for additional terms.
diff --git a/mediagoblin/contrib/960_16_col.css b/extlib/960.gs/960_16_col.css
index faa6d8b2..faa6d8b2 100644
--- a/mediagoblin/contrib/960_16_col.css
+++ b/extlib/960.gs/960_16_col.css
diff --git a/extlib/960.gs/README.txt b/extlib/960.gs/README.txt
new file mode 100755
index 00000000..da0ea86f
--- /dev/null
+++ b/extlib/960.gs/README.txt
@@ -0,0 +1,54 @@
+===============
+960 GRID SYSTEM
+===============
+
+Created by Nathan Smith. See the official site for more info: http://960.gs/
+
+============================================================================
+
+To install the Adobe Fireworks extension, simply double-click the *.mxp file
+included in the /fireworks_extension directory. If you are running Windows 7
+you will need admin permissions in order to install this extension properly.
+
+============================================================================
+
+Thank you for downloading the 960 Grid System. I hope it helps to streamline
+web development workflow. Enclosed in the bundle are printable sketch sheets
+and template files for Adobe Fireworks and Photoshop, OmniGraffle and Visio.
+
+Also included is a lightweight CSS file, which contains the grid dimensions.
+To use this file, simply include the 960.css in the <head> of the HTML page.
+You may also use the reset.css and text.css files, or opt to leave them out.
+Here is an example of the XHTML code necessary to incorporate the CSS files:
+
+<head>
+<link rel="stylesheet" type="text/css" media="all" href="css/reset.css" />
+<link rel="stylesheet" type="text/css" media="all" href="css/text.css" />
+<link rel="stylesheet" type="text/css" media="all" href="css/960.css" />
+</head>
+
+It is worth noting that these styles do not automatically make up a finished
+site design. They are simply a starting point, ideally for rapid prototyping
+or as a basis for creating your own designs. You should not feel constrained
+by the way I have built the initial code. If you disagree with how something
+has been done, feel free to revise it for the needs of your particular site.
+
+The files in the 960 Grid System are free of charge, licensed under MIT/GPL.
+
+============================================================================
+
+Note that if you are building a site in a language which reads from right to
+left, use the CSS files that end in "_rtl.css" instead. Denote the language:
+
+<html lang="..." dir="rtl">
+
+Be sure to replace "..." with the appropriate two-letter abbreviation of the
+language you are using. Example: lang="he" for Hebrew, lang="ar" for Arabic.
+
+============================================================================
+
+GPL license:
+http://www.gnu.org/licenses/gpl.html
+
+MIT license:
+http://www.opensource.org/licenses/mit-license.php
\ No newline at end of file
diff --git a/mediagoblin/contrib/reset.css b/extlib/960.gs/reset.css
index 87b7f368..87b7f368 100644
--- a/mediagoblin/contrib/reset.css
+++ b/extlib/960.gs/reset.css
diff --git a/mediagoblin/contrib/text.css b/extlib/960.gs/text.css
index 1a6b302f..1a6b302f 100644
--- a/mediagoblin/contrib/text.css
+++ b/extlib/960.gs/text.css
diff --git a/extlib/README b/extlib/README
new file mode 100644
index 00000000..c23da6e6
--- /dev/null
+++ b/extlib/README
@@ -0,0 +1,71 @@
+=========================
+ External Library README
+=========================
+
+DO NOT "FIX" CODE IN THIS DIRECTORY.
+
+ONLY UPSTREAM VERSIONS OF SOFTWARE GO IN THIS DIRECTORY.
+
+This directory is provided as a courtesy to our users who might be
+unable or unwilling to find and install libraries we depend on.
+
+If we "fix" software in this directory, we hamstring users who do the
+right thing and keep a single version of upstream libraries in a
+system-wide library.  We introduce subtle and maddening bugs where
+our code is "accidentally" using the "wrong" library version.  We may
+unwittingly interfere with other software that depends on the
+canonical release versions of those same libraries!
+
+Forking upstream software for trivial reasons makes us bad citizens in
+the Open Source community and adds unnecessary heartache for our
+users.  Don't make us "that" project.
+
+
+FAQ
+===
+
+:Q: What should we do when we find a bug in upstream software?
+
+:A: First and foremost, REPORT THE BUG, and if possible send in a patch.
+
+    Watch for a release of the upstream software and integrate with it
+    when it's released.
+
+    In the meantime, work around the bug, if at all possible.  Usually,
+    it's quite possible, if slightly harder or less efficient.
+
+:Q: What if the bug can't be worked around?
+
+:A: If the upstream developers have accepted a bug patch, it's
+    undesirable but acceptable to apply that patch to the library in
+    the ``extlib/`` dir.  Ideally, use a release version for upstream or a
+    version control system snapshot.
+
+    Note that this is a last resort.
+
+:Q: What if upstream is unresponsive or won't accept a patch?
+
+:A: Try again.
+
+:Q: I tried again, and upstream is still unresponsive and nobody's
+    checked on my patch.  Now what?
+
+:A: If the upstream project is moribund and there's a way to adopt it,
+    propose having the StatusNet dev team adopt the project.  Or, adopt
+    it yourself.
+
+:Q: What if there's no upstream authority and it can't be adopted?
+
+:A: Then we fork it.  Make a new name and a new version. Include it in
+    ``lib/`` instead of ``extlib/``, and use the GMG_* prefix to change
+    the namespace to avoid collisions (or something like that).
+
+    This is a last resort; consult with the rest of the dev group
+    before taking this radical step.
+
+
+Thanks
+======
+
+This policy originally copied from Status.net.  Many many thanks to them
+for working out such a nice system for doing things.
diff --git a/AGPLv3.txt b/licenses/AGPLv3.txt
index dba13ed2..dba13ed2 100644
--- a/AGPLv3.txt
+++ b/licenses/AGPLv3.txt
diff --git a/CC0_1.0.txt b/licenses/CC0_1.0.txt
index 0e259d42..0e259d42 100644
--- a/CC0_1.0.txt
+++ b/licenses/CC0_1.0.txt
diff --git a/licenses/LGPLv3.txt b/licenses/LGPLv3.txt
new file mode 100644
index 00000000..65c5ca88
--- /dev/null
+++ b/licenses/LGPLv3.txt
@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/mediagoblin/static/css/contrib/960_16_col.css b/mediagoblin/static/css/contrib/960_16_col.css
deleted file mode 120000
index bc1a430c..00000000
--- a/mediagoblin/static/css/contrib/960_16_col.css
+++ /dev/null
@@ -1 +0,0 @@
-../../../contrib/960_16_col.css
\ No newline at end of file
diff --git a/mediagoblin/static/css/contrib/reset.css b/mediagoblin/static/css/contrib/reset.css
deleted file mode 120000
index 87ae5592..00000000
--- a/mediagoblin/static/css/contrib/reset.css
+++ /dev/null
@@ -1 +0,0 @@
-../../../contrib/reset.css
\ No newline at end of file
diff --git a/mediagoblin/static/css/contrib/text.css b/mediagoblin/static/css/contrib/text.css
deleted file mode 120000
index d75ce48b..00000000
--- a/mediagoblin/static/css/contrib/text.css
+++ /dev/null
@@ -1 +0,0 @@
-../../../contrib/text.css
\ No newline at end of file
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 656fb46b..6af02c00 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -21,11 +21,11 @@
     <meta charset="utf-8">
     <title>{% block title %}GNU MediaGoblin{% endblock title %}</title>
     <link rel="stylesheet" type="text/css"
-          href="{{ request.staticdirect('/css/contrib/reset.css') }}"/>
+          href="{{ request.staticdirect('/css/extlib/reset.css') }}"/>
     <link rel="stylesheet" type="text/css"
-          href="{{ request.staticdirect('/css/contrib/text.css') }}"/>
+          href="{{ request.staticdirect('/css/extlib/text.css') }}"/>
     <link rel="stylesheet" type="text/css"
-          href="{{ request.staticdirect('/css/contrib/960_16_col.css') }}"/>
+          href="{{ request.staticdirect('/css/extlib/960_16_col.css') }}"/>
     <link rel="stylesheet" type="text/css"
           href="{{ request.staticdirect('/css/base.css') }}"/>
     {% block mediagoblin_head %}