From cf60858b55a1ce8d99daa301f7aad9a7ffeb0bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sat, 28 May 2011 13:56:22 +0200 Subject: [PATCH 1/5] r88824: Prepare for 2.5.6c1. --- Include/patchlevel.h | 6 +++--- Lib/idlelib/NEWS.txt | 5 +++++ Lib/idlelib/idlever.py | 2 +- Misc/NEWS | 2 +- README | 4 ++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Include/patchlevel.h b/Include/patchlevel.h index 80e765de54a..f1e513c4671 100644 --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -22,11 +22,11 @@ #define PY_MAJOR_VERSION 2 #define PY_MINOR_VERSION 5 #define PY_MICRO_VERSION 6 -#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_ALPHA -#define PY_RELEASE_SERIAL 0 +#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA +#define PY_RELEASE_SERIAL 1 /* Version as a string */ -#define PY_VERSION "2.5.5+" +#define PY_VERSION "2.5.6c1" /* Subversion Revision number of this file (not of the repository) */ #define PY_PATCHLEVEL_REVISION "$Revision$" diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 5b2b4c7eb26..74971082f17 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -1,3 +1,8 @@ +What's New in IDLE 1.2.6c1? +=========================== + +*Release date: 17-Apr-2011* + What's New in IDLE 1.2.5? ========================= diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py index df6aff7ae16..1dd637c20dd 100644 --- a/Lib/idlelib/idlever.py +++ b/Lib/idlelib/idlever.py @@ -1 +1 @@ -IDLE_VERSION = "1.2.5" +IDLE_VERSION = "1.2.6c1" diff --git a/Misc/NEWS b/Misc/NEWS index 4db0b033056..d377b2a4ee2 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -7,7 +7,7 @@ Python News What's New in Python 2.5.6c1? ============================= -*Release date: XX-XXX-2010* +*Release date: 17-Apr-2010* Library ------- diff --git a/README b/README index f8e6ce6a811..0fd2f5daa8d 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -This is Python version 2.5.5 -============================ +This is Python version 2.5.6c1 +============================== Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Python Software Foundation. All rights reserved. From e81c485e5778b1dd628f4bf0f5aecd16d02f91df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sat, 28 May 2011 13:57:28 +0200 Subject: [PATCH 2/5] r88828: Fix year. --- Misc/NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index d377b2a4ee2..96fd36b4be4 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -7,7 +7,7 @@ Python News What's New in Python 2.5.6c1? ============================= -*Release date: 17-Apr-2010* +*Release date: 17-Apr-2011* Library ------- From 11a859d70dffc8da51d346dabd1fe6a635825ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sat, 28 May 2011 13:58:36 +0200 Subject: [PATCH 3/5] r88840: Prepare for 2.5.6. --- Include/patchlevel.h | 6 +++--- Lib/idlelib/NEWS.txt | 5 +++++ Lib/idlelib/idlever.py | 2 +- Misc/NEWS | 6 ++++++ README | 4 ++-- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Include/patchlevel.h b/Include/patchlevel.h index f1e513c4671..0cefd6e6458 100644 --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -22,11 +22,11 @@ #define PY_MAJOR_VERSION 2 #define PY_MINOR_VERSION 5 #define PY_MICRO_VERSION 6 -#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA -#define PY_RELEASE_SERIAL 1 +#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL +#define PY_RELEASE_SERIAL 0 /* Version as a string */ -#define PY_VERSION "2.5.6c1" +#define PY_VERSION "2.5.6" /* Subversion Revision number of this file (not of the repository) */ #define PY_PATCHLEVEL_REVISION "$Revision$" diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 74971082f17..562929ab818 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -1,3 +1,8 @@ +What's New in IDLE 1.2.6? +========================= + +*Release date: 26-May-2011* + What's New in IDLE 1.2.6c1? =========================== diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py index 1dd637c20dd..40604e5d9ee 100644 --- a/Lib/idlelib/idlever.py +++ b/Lib/idlelib/idlever.py @@ -1 +1 @@ -IDLE_VERSION = "1.2.6c1" +IDLE_VERSION = "1.2.6" diff --git a/Misc/NEWS b/Misc/NEWS index 96fd36b4be4..d15f30ac853 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -4,6 +4,12 @@ Python News (editors: check NEWS.help for information about editing NEWS using ReST.) +What's New in Python 2.5.6? +=========================== + +*Release date: 26-May-2011* + + What's New in Python 2.5.6c1? ============================= diff --git a/README b/README index 0fd2f5daa8d..a1e1801e07e 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -This is Python version 2.5.6c1 -============================== +This is Python version 2.5.6 +============================ Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Python Software Foundation. All rights reserved. From 4ca9d48a04e79f76ab9850371b9465da1268371c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sat, 28 May 2011 14:00:37 +0200 Subject: [PATCH 4/5] Added tag v2.5.6 for changeset de34c7b097e8 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 112ac969cbc..1734daa6684 100644 --- a/.hgtags +++ b/.hgtags @@ -112,3 +112,4 @@ a0a6d9909312ad9c1d844af66e9c91931b93852a v2.5.4 657f16582943739b906f66f7efad4014492c8b1c v2.5.5c1 1dc91e9dd5c13a4bc2d3bb7d4b5896ab264f2325 v2.5.5c2 7098a46f0b75e5aacfaf81d65d72e3613b023532 v2.5.5 +de34c7b097e8d66b1140c211dbd61d48b31ba483 v2.5.6 From dcdf0320c06a5af9c4f059fb97e1ccb25fd9a56e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sat, 28 May 2011 14:05:31 +0200 Subject: [PATCH 5/5] Added tag v2.5.6c1 for changeset a87c7b96672b --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 112ac969cbc..1f9f2dd2c11 100644 --- a/.hgtags +++ b/.hgtags @@ -112,3 +112,4 @@ a0a6d9909312ad9c1d844af66e9c91931b93852a v2.5.4 657f16582943739b906f66f7efad4014492c8b1c v2.5.5c1 1dc91e9dd5c13a4bc2d3bb7d4b5896ab264f2325 v2.5.5c2 7098a46f0b75e5aacfaf81d65d72e3613b023532 v2.5.5 +a87c7b96672b69dffef64c59b56fba5bb2059b99 v2.5.6c1