Skip to content

Commit

Permalink
Merge pull request #13 from andbag/relicense-BSD
Browse files Browse the repository at this point in the history
change from GPL to BSD. Refs: #10
  • Loading branch information
thet authored Jan 15, 2019
2 parents d3ec5c4 + 30a089f commit 6a758e9
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 298 deletions.
12 changes: 11 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Changelog
=========

1.2.4 (unreleased)
2.0.1 (unreleased)
------------------

Breaking changes:
Expand All @@ -17,6 +17,16 @@ Bug fixes:
- *add item here*


2.0 (15.01.2019)
------------------

Breaking changes:

- Relicensed under BSD (documented September 2010,
https://plone.org/foundation/materials/foundation-resolutions/plone-framework-components-relicensing-policy)
[andbag]


1.2.3 (2018-09-26)
------------------

Expand Down
280 changes: 0 additions & 280 deletions docs/LICENSE.GPL

This file was deleted.

27 changes: 27 additions & 0 deletions docs/LICENSE.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
plone.memoize is copyright (c) 2010, Plone Foundation
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

2. 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.

3. Neither the name of the copyright holder nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.

THIS SOFTWARE 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 HOLDER 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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
15 changes: 0 additions & 15 deletions docs/LICENSE.txt

This file was deleted.

4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def read(*rnames):
"Framework :: Plone :: 5.1",
"Framework :: Plone :: 5.2",
"Framework :: Zope2",
"License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
"License :: OSI Approved :: BSD License",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 2.7",
Expand All @@ -44,7 +44,7 @@ def read(*rnames):
author='Plone Foundation',
author_email='plone-developers@lists.sourceforge.net',
url='https://pypi.org/project/plone.memoize',
license='GPL version 2',
license='BSD',
packages=find_packages(),
namespace_packages=['plone'],
include_package_data=True,
Expand Down

0 comments on commit 6a758e9

Please sign in to comment.