licence files (tidying)

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

diff --git a/Cargo.toml b/Cargo.toml
index f50b47e720ab68b30d2c6856de30550104b330a0..dea963d2ca883f7a265eefdee02cbbd47a1a3782 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,39 +4,6 @@
 
 [package]
 name = "otter"
-
-# This file is part of "otter", Online TableTop Environment Renderer,
-# a multiplayer online tabletop gameplay system.
-#
-#  "otter" 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 <http://www.gnu.org/licenses/>.
-#
-# Individual files generally contain the following tag in the copyright
-# notice, instead of the full licence grant text:
-#   SPDX-License-Identifier: AGPL-3.0-or-later
-# As is conventional, this should be read as a licence grant.
-#
-# Contributions are accepted based on the git commit Signed-off-by
-# convention, by which the contributors' certify their contributions
-# according to the Developer Certificate of Origin version 1.1 - see
-# the file DEVELOPER-CERTIFICATE.
-#
-# Some individual files are dual-licenced and say
-#   "MIT-0 OR AGPL-3.0-or-later"
-# Those files are available under the MIT-0 permissive licence when
-# taken separately, but when distributed as part of otter, they are
-# AGPLv3+.
-
 authors = ["Ian Jackson <ijackson@chiark.greenend.org.uk>"]
 license = "AGPL-3.0-or-later"
 

diff --git a/DEVELOPER-CERTIFICATE b/DEVELOPER-CERTIFICATE
new file mode 100644 (file)
index 0000000..912d22e
--- /dev/null
+++ b/DEVELOPER-CERTIFICATE
@@ -0,0 +1,38 @@
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+1 Letterman Drive
+Suite D4700
+San Francisco, CA, 94129
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.
+

diff --git a/LICENCE b/LICENCE
deleted file mode 120000 (symlink)
index f1987d6db4ffa232d576d8915f55ef18b0e8e800..0000000000000000000000000000000000000000
--- a/LICENCE
+++ /dev/null
@@ -1 +0,0 @@
-AGPLv3
\ No newline at end of file

diff --git a/LICENCE b/LICENCE
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..4f54f58f88a06ff87453c7e50bf5a66b3ed0d7b2
--- /dev/null
+++ b/LICENCE
@@ -0,0 +1,47 @@
+This is "otter", Online TableTop Environment Renderer,
+a multiplayer online tabletop gameplay system.
+
+
+"otter" 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 v3 along with this program, in the file AGPL-3.
+If not, see <http://www.gnu.org/licenses/>.
+
+
+Formalities
+-----------
+
+Individual files generally contain the following tag in the copyright
+notice, instead of the full licence grant text:
+  SPDX-License-Identifier: AGPL-3.0-or-later
+As is conventional, this should be read as a licence grant.
+
+Contributions are accepted based on the git commit Signed-off-by
+convention, by which the contributors' certify their contributions
+according to the Developer Certificate of Origin version 1.1 - see
+the file DEVELOPER-CERTIFICATE.
+
+If you create a new file please be sure to add an appropriate licence
+header, probably something like this:
+// Copyright by contributors to the otter game system
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// There is NO WARRANTY.
+
+
+Partial dual licence
+--------------------
+
+Some individual files are dual-licenced and say
+  "MIT-0 OR AGPL-3.0-or-later"
+Those files are available under the MIT-0 permissive licence when
+taken separately, but when distributed as part of otter, they are
+AGPLv3+.

diff --git a/LICENSE b/LICENSE
index f1987d6db4ffa232d576d8915f55ef18b0e8e800..97ea633d8d3c84c7afa6762833edbe56e052cc0d 120000 (symlink)
--- a/LICENSE
+++ b/LICENSE
@@ -1 +1 @@
-AGPLv3
\ No newline at end of file
+LICENCE
\ No newline at end of file