LICENCE: Allow shapes to be AGPLv3+

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/LICENCE b/LICENCE
index f9048ff11f403fd69da03591d21dd1f9ebb30a6c..ff04908b24c9eb241a0032d22909897eddd1ee4b 100644 (file)
--- a/LICENCE
+++ b/LICENCE
@@ -34,12 +34,13 @@ Shape libraries
 The shape librariues in library/ are *not* part of Otter itself.  The
 files there have a variety of different licences, and are often
 multiply-licenced.  But all of these files are available under
-at least CC-BY-SA 3.0 or CC-BY-SA 4.0, so:
+at least CC-BY-SA 3.0, CC-BY-SA 4.0 or AGPLv3+, so:
 
 The shape libraries are licensed under either the Creative Commons
 Attribution-Share Alike 3.0 Unported License, or the Creative Commons
-Attribution-ShareAlike 4.0 International Licence.
-There is NO WARRANTY.
+Attribution-ShareAlike 4.0 International Licence, or the GNU Affero
+General Public License (version 3 or at your option any later
+version).  There is NO WARRANTY
 
 Many of these files were downloaded from public sources using the
 ./media-scraper script; if they are to be edited, it would be best to
@@ -64,8 +65,9 @@ source tree, where the full authorship and licence information, and
 source url etc., can be found.
 
 You can find a copy of the actual licences in the files
-CC-BY-SA-3.0.txt and CC-BY-SA-4.0.txt.  If not, see
-<https://creativecommons.org/>.
+  CC-BY-SA-3.0.txt  CC-BY-SA-4.0.txt  AGPL
+If not, see <https://creativecommons.org/> or
+<http://www.gnu.org/licenses/>.
 
 
 Formalities

diff --git a/README.md b/README.md
index 9663e4f45eb3c60b7f4ead0eedb23b253309ef51..4d8e1b1b93a5f057be80a34e3d95359d68c3c394 100644 (file)
--- a/README.md
+++ b/README.md
@@ -104,8 +104,8 @@ If you copied or adapted an SVG from somewhere, provide details.
 Contributions should be via git branch, eg a merge request on Salsa:
 [https://salsa.debian.org/iwj/otter](https://salsa.debian.org/iwj/otter)
 
-NB that shapes must come with a licence compatible with CC-BY-SA 4.0.
-See `LICENCE` for more information about copyright status.
+NB that shapes must come with a licence compatible with CC-BY-SA 4.0
+or GNU AGPLv3+.  See `LICENCE` for more information about copyright status.
 
 
 BUILDING AND TESTING