diff options
| author | Georg Brandl <georg@python.org> | 2014-10-04 12:16:59 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-10-04 12:16:59 (GMT) |
| commit | edc3cbaaba1493a00572ad46daaab14e341d738e (patch) | |
| tree | 5db46d5b6a9e72f641928cf1faf783df1e67b382 | |
| parent | e800a0e1c2b93f185580ae3926b239e2944b56d9 (diff) | |
| download | cpython-edc3cbaaba1493a00572ad46daaab14e341d738e.zip cpython-edc3cbaaba1493a00572ad46daaab14e341d738e.tar.gz cpython-edc3cbaaba1493a00572ad46daaab14e341d738e.tar.bz2 | |
Copyright year update, add version to licenses.v3.2.6rc1
| -rw-r--r-- | Doc/README.txt | 2 | ||||
| -rw-r--r-- | Doc/license.rst | 6 | ||||
| -rw-r--r-- | LICENSE | 4 | ||||
| -rw-r--r-- | PC/python_nt.rc | 2 | ||||
| -rw-r--r-- | Python/getcopyright.c | 2 |
5 files changed, 11 insertions, 5 deletions
diff --git a/Doc/README.txt b/Doc/README.txt index c63fc60..a16c14a 100644 --- a/Doc/README.txt +++ b/Doc/README.txt @@ -135,7 +135,7 @@ The Python source is copyrighted, but you can freely use and copy it as long as you don't change or remove the copyright notice: ---------------------------------------------------------------------- -Copyright (c) 2000-2013 Python Software Foundation. +Copyright (c) 2000-2014 Python Software Foundation. All rights reserved. Copyright (c) 2000 BeOpen.com. diff --git a/Doc/license.rst b/Doc/license.rst index a3257f8..32a36b9 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -122,6 +122,10 @@ been GPL-compatible; the table below summarizes the various releases. +----------------+--------------+------------+------------+-----------------+ | 3.2.4 | 3.2.3 | 2013 | PSF | yes | +----------------+--------------+------------+------------+-----------------+ +| 3.2.5 | 3.2.4 | 2013 | PSF | yes | ++----------------+--------------+------------+------------+-----------------+ +| 3.2.6 | 3.2.5 | 2014 | PSF | yes | ++----------------+--------------+------------+------------+-----------------+ .. note:: @@ -150,7 +154,7 @@ Terms and conditions for accessing or otherwise using Python analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python |release| alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of - copyright, i.e., "Copyright © 2001-2013 Python Software Foundation; All Rights + copyright, i.e., "Copyright © 2001-2014 Python Software Foundation; All Rights Reserved" are retained in Python |release| alone or in any derivative version prepared by Licensee. @@ -75,6 +75,8 @@ the various releases. 3.2.2 3.2.1 2011 PSF yes 3.2.3 3.2.2 2012 PSF yes 3.2.4 3.2.3 2013 PSF yes + 3.2.5 3.2.4 2013 PSF yes + 3.2.6 3.2.5 2014 PSF yes Footnotes: @@ -110,7 +112,7 @@ analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -2011, 2012, 2013 Python Software Foundation; All Rights Reserved" are retained +2011, 2012, 2013, 2014 Python Software Foundation; All Rights Reserved" are retained in Python alone or in any derivative version prepared by Licensee. 3. In the event Licensee prepares a derivative work that is based on diff --git a/PC/python_nt.rc b/PC/python_nt.rc index f31c836..3f55723 100644 --- a/PC/python_nt.rc +++ b/PC/python_nt.rc @@ -61,7 +61,7 @@ BEGIN VALUE "FileDescription", "Python Core\0" VALUE "FileVersion", PYTHON_VERSION VALUE "InternalName", "Python DLL\0" - VALUE "LegalCopyright", "Copyright © 2001-2013 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0" + VALUE "LegalCopyright", "Copyright © 2001-2014 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0" VALUE "OriginalFilename", PYTHON_DLL_NAME "\0" VALUE "ProductName", "Python\0" VALUE "ProductVersion", PYTHON_VERSION diff --git a/Python/getcopyright.c b/Python/getcopyright.c index 218d55f..d9da116 100644 --- a/Python/getcopyright.c +++ b/Python/getcopyright.c @@ -4,7 +4,7 @@ static char cprt[] = "\ -Copyright (c) 2001-2013 Python Software Foundation.\n\ +Copyright (c) 2001-2014 Python Software Foundation.\n\ All Rights Reserved.\n\ \n\ Copyright (c) 2000 BeOpen.com.\n\ |