From 7aa0ea20be34a16b17aac48c0db4efa8d4e335b0 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Fri, 7 Apr 2017 15:32:27 +0200 Subject: [PATCH] Relicense to 3-clause BSD, fix #610 --- CHANGELOG.rst | 1 + LICENSE | 46 ++++++++++++++++++++++++++++++---------------- MANIFEST.in | 2 +- README.rst | 2 +- setup.py | 4 ++-- 5 files changed, 35 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 93b85f2..2ae1a31 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -23,6 +23,7 @@ Version 0.16.0 improvements. This means that **sqlite3 is now a dependency of vdirsyncer**. - Vdirsyncer now ignores folders with a leading dot. This makes it easier to combine it with version control. +- **Vdirsyncer is now licensed under the 3-clause BSD license**, see :gh:`610`. Version 0.15.0 ============== diff --git a/LICENSE b/LICENSE index 7db6b2e..24e4d9b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,19 +1,33 @@ -Copyright (c) 2014-2016 Markus Unterwaditzer & contributors +Copyright (c) 2014-2016 by Markus Unterwaditzer & contributors. See +AUTHORS.rst for more details. -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: +Some rights reserved. -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +Redistribution and use in source and binary forms of the software as well +as documentation, with or without modification, are permitted provided +that the following conditions are met: -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + +* The names of the contributors may not be used to endorse or + promote products derived from this software without specific + prior written permission. + +THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND +CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT +NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER +OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE AND DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. diff --git a/MANIFEST.in b/MANIFEST.in index 04cb1db..3edb7e7 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -8,7 +8,7 @@ include docs-requirements.txt recursive-include docs * recursive-include tests * -recursive-include contrib * +prune contrib prune tests/storage/servers recursive-include tests/storage/servers/radicale * recursive-include tests/storage/servers/skip * diff --git a/README.rst b/README.rst index ddc608a..41bdad2 100644 --- a/README.rst +++ b/README.rst @@ -41,7 +41,7 @@ Links of interest License ======= -Licensed under the Expat/MIT license, see ``LICENSE``. +Licensed under the 3-clause BSD license, see ``LICENSE``. Donations ========= diff --git a/setup.py b/setup.py index 619e0f1..6c89e4b 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ setup( author_email='markus@unterwaditzer.net', url='https://github.com/pimutils/vdirsyncer', description='Synchronize calendars and contacts', - license='MIT', + license='BSD', long_description=long_description, # Runtime dependencies @@ -92,7 +92,7 @@ setup( classifiers=[ 'Development Status :: 4 - Beta', 'Environment :: Console', - 'License :: OSI Approved :: MIT License', + 'License :: OSI Approved :: BSD License', 'Operating System :: POSIX', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.3',