[Python-checkins] cpython (3.2): Copyright year update, add version to licenses.

georg.brandl python-checkins at python.org
Sat Oct 4 15:09:55 CEST 2014


https://hg.python.org/cpython/rev/51382a5598ec
changeset:   92802:51382a5598ec
branch:      3.2
tag:         v3.2.6rc1
user:        Georg Brandl <georg at python.org>
date:        Sat Oct 04 14:16:59 2014 +0200
summary:
  Copyright year update, add version to licenses.

files:
  Doc/README.txt        |  2 +-
  Doc/license.rst       |  6 +++++-
  LICENSE               |  4 +++-
  PC/python_nt.rc       |  2 +-
  Python/getcopyright.c |  2 +-
  5 files changed, 11 insertions(+), 5 deletions(-)


diff --git a/Doc/README.txt b/Doc/README.txt
--- a/Doc/README.txt
+++ b/Doc/README.txt
@@ -135,7 +135,7 @@
 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
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -122,6 +122,10 @@
 +----------------+--------------+------------+------------+-----------------+
 | 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 @@
    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.
 
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -75,6 +75,8 @@
     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 @@
 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
--- a/PC/python_nt.rc
+++ b/PC/python_nt.rc
@@ -61,7 +61,7 @@
             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
--- 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\

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list