]> granicus.if.org Git - python/commitdiff
Copyright year update, add version to licenses. v3.2.6rc1
authorGeorg Brandl <georg@python.org>
Sat, 4 Oct 2014 12:16:59 +0000 (14:16 +0200)
committerGeorg Brandl <georg@python.org>
Sat, 4 Oct 2014 12:16:59 +0000 (14:16 +0200)
Doc/README.txt
Doc/license.rst
LICENSE
PC/python_nt.rc
Python/getcopyright.c

index c63fc608a8c6e4d1d5538e4bf91e392bd3bec0ef..a16c14ac61d59bd47bae0dc129abd4a93e4af913 100644 (file)
@@ -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.
index a3257f87d4b9cc45133e6abb469083937308ff72..32a36b9e6e2736a842d3c2e005530732ecb70e52 100644 (file)
@@ -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.
 
diff --git a/LICENSE b/LICENSE
index b9e39274812480bf260442872e02611299d62aac..3fdc973b896b2ee7c5959dd1b76ef9f396cf1cb4 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -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
index f31c83687821e2f48ba80d7bcc1d2ec76b5c3b51..3f55723119169b639da0d9855f2170816f256f12 100644 (file)
@@ -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
index 218d55f6edd0209057001d956ad6f58e13070fce..d9da116e4629f4a2cc9d28135fa6ce1b981e5790 100644 (file)
@@ -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\