Menu
▾
▴
[Plone-cvs] r37902 - in plone.portlet.static/trunk: . docs
|
From: Hanno S. <svn...@pl...> - 2010-07-16 14:16:49
|
Author: hannosch
Date: Fri Jul 16 14:16:40 2010
New Revision: 37902
Modified:
plone.portlet.static/trunk/CHANGES.txt
plone.portlet.static/trunk/docs/LICENSE.GPL
plone.portlet.static/trunk/docs/LICENSE.txt
plone.portlet.static/trunk/setup.py
Log:
Update license to GPL version 2 only.
Modified: plone.portlet.static/trunk/CHANGES.txt
==============================================================================
--- plone.portlet.static/trunk/CHANGES.txt (original)
+++ plone.portlet.static/trunk/CHANGES.txt Fri Jul 16 14:16:40 2010
@@ -1,9 +1,11 @@
Changelog
=========
-2.0b3 - unreleased
-------------------
+2.0 - unreleased
+----------------
+- Update license to GPL version 2 only.
+ [hannosch]
2.0b2 - 2010-02-17
------------------
Modified: plone.portlet.static/trunk/docs/LICENSE.GPL
==============================================================================
--- plone.portlet.static/trunk/docs/LICENSE.GPL (original)
+++ plone.portlet.static/trunk/docs/LICENSE.GPL Fri Jul 16 14:16:40 2010
@@ -1,4 +1,62 @@
- GNU GENERAL PUBLIC LICENSE
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
@@ -52,7 +110,7 @@
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
-
+
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -110,7 +168,7 @@
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
+
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -167,7 +225,7 @@
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -197,7 +255,7 @@
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -219,4 +277,4 @@
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
+ END OF TERMS AND CONDITIONS
Modified: plone.portlet.static/trunk/docs/LICENSE.txt
==============================================================================
--- plone.portlet.static/trunk/docs/LICENSE.txt (original)
+++ plone.portlet.static/trunk/docs/LICENSE.txt Fri Jul 16 14:16:40 2010
@@ -1,9 +1,9 @@
-plone.portlet.static is copyright Plone Foundation
+plone.portlet.static
+Copyright (C) 2007-2010 Plone Foundation
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License version 2
+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
@@ -12,5 +12,4 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-MA 02111-1307 USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Modified: plone.portlet.static/trunk/setup.py
==============================================================================
--- plone.portlet.static/trunk/setup.py (original)
+++ plone.portlet.static/trunk/setup.py Fri Jul 16 14:16:40 2010
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages
-version = '2.0b3'
+version = '2.0'
setup(name='plone.portlet.static',
version=version,
@@ -8,14 +8,18 @@
long_description=open("README.txt").read() + "\n" +
open("CHANGES.txt").read(),
classifiers=[
- "Framework :: Plone",
- "Programming Language :: Python",
+ "Environment :: Web Environment",
+ "Framework :: Plone",
+ "Framework :: Zope2",
+ "License :: OSI Approved :: GNU General Public License (GPL)",
+ "Operating System :: OS Independent",
+ "Programming Language :: Python",
],
- keywords='plone portlet',
- author='Martin Aspeli',
+ keywords='plone portlet static',
+ author='Plone Foundation',
author_email='plo...@li...',
- url='http://plone.org',
- license='GPL',
+ url='http://pypi.python.org/pypi/plone.portlet.static',
+ license='GPL version 2',
packages=find_packages(exclude=['ez_setup']),
namespace_packages=["plone", 'plone.portlet'],
include_package_data=True,
|