Merge pull request #157 from saxbophone/josh/mpl-2.0

Change software license of the project to MPL-2.0

Author: saxbophone

CLA_ENTITY.md

@@ -86,19 +86,16 @@ Agreement</h1>
 <p>6.5 If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and which is enforceable.  The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law.</p>
 
 <p>You<br />
-________________________<br />
-Name: __________________<br />
-Title: ___________________<br />
-Address: ________________<br />
-________________________<br />
+Name: ________________________________________<br />
+Title: ________________________________________<br />
+Email: ________________________________________<br />
 </p>
 
 <p>Us<br />
-________________________<br />
-Name: __________________<br />
-Title: ___________________<br />
-Address: ________________<br />
-________________________<br />
+Name: Joshua Saxby____________________________<br />
+Title: Project Maintainer______________________<br />
+Email: [email protected]________________<br />
 </p>
 
+
 <p align=right>Harmony (HA-CLA-E-OSI) Version 1.0</p>

CLA_INDIVIDUAL.md

@@ -85,18 +85,14 @@ Agreement</h1>
 <p>6.5 If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and which is enforceable.  The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law.</p>
 
 <p>You<br />
-________________________<br />
-Name: __________________<br />
-Address: ________________<br />
-________________________<br />
+Name: ________________________________________<br />
+Email: ________________________________________<br />
 </p>
 
 <p>Us<br />
-________________________<br />
-Name: __________________<br />
-Title: ___________________<br />
-Address: ________________<br />
-________________________<br />
+Name: Joshua Saxby____________________________<br />
+Title: Project Maintainer______________________<br />
+Email: [email protected]________________<br />
 </p>
 
 <p align=right>Harmony (HA-CLA-I-OSI) Version 1.0</p>

CMakeLists.txt

@@ -8,22 +8,14 @@
 #
 # Copyright (C) 2016, Joshua Saxby [email protected]
 #
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License (version 3),
-# as published by the Free Software Foundation.
-#
-# 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/>.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # begin basic metadata
 cmake_minimum_required(VERSION 3.0)
 
-project(sxbp VERSION 0.24.2 LANGUAGES C)
+project(sxbp VERSION 0.25.0 LANGUAGES C)
 
 # set default C standard to use (C99) if not already set
 if(NOT DEFINED LIBSXBP_C_STANDARD)

CONTRIBUTING.md

@@ -2,9 +2,16 @@
 
 Thanks for considering contributing to libsxbp!
 
-To get started, [sign the Contributor License Agreement](https://www.clahub.com/agreements/saxbophone/libsxbp).
+First of all, please read and make sure that you agree to this project's **Contributor License Agreement**:
 
-> [A copy of the CLA](CLA_INDIVIDUAL.md) is also available in this repository.
+- If you are contributing as an individual, please read and sign [this document](CLA_INDIVIDUAL.md).
+- If you are contributing as an entity (e.g. a company or organisation), please read and sign [this document](CLA_ENTITY.md).
+
+Signed copies of the above agreements should be emailed to me (@saxbophone / Joshua Saxby) at <[email protected]>.
+
+I will then add your details (full name and email address) to the [CONTRIBUTORS.md](CONTRIBUTORS.md) file in this repository.
+
+**If you do not want me to put your email address in this file, then tell me so and I will use another public handle of yours (most likely your Github username).**
 
 Here are some tips and general info about contributing to this project. Following these tips will increase the likelihood of getting a speedy PR :smile:
 

CONTRIBUTORS.md

@@ -0,0 +1,11 @@
+# Contributors to libsxbp
+
+All of these people have my eternal gratitude
+
+## Individuals
+
+...
+
+## Entities
+
+...