summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Doc/commontex/boilerplate.tex2
-rw-r--r--Include/patchlevel.h6
-rw-r--r--Lib/idlelib/NEWS.txt5
-rw-r--r--Lib/idlelib/idlever.py2
-rw-r--r--Misc/NEWS7
-rw-r--r--Misc/RPM/python-2.5.spec2
-rw-r--r--README4
7 files changed, 20 insertions, 8 deletions
diff --git a/Doc/commontex/boilerplate.tex b/Doc/commontex/boilerplate.tex
index 3545a67..68b0abf 100644
--- a/Doc/commontex/boilerplate.tex
+++ b/Doc/commontex/boilerplate.tex
@@ -5,5 +5,5 @@
Email: \email{docs@python.org}
}
-\date{12th September, 2006} % XXX update before final release!
+\date{19th September, 2006} % XXX update before final release!
\input{patchlevel} % include Python version information
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 0990a18..3043189 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 0
-#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL 2
+#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL
+#define PY_RELEASE_SERIAL 0
/* Version as a string */
-#define PY_VERSION "2.5c2"
+#define PY_VERSION "2.5"
/* 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 74897fa..4f4115d 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -1,3 +1,8 @@
+What's New in IDLE 1.2?
+=======================
+
+*Release date: 19-SEP-2006*
+
What's New in IDLE 1.2c2?
=========================
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
index 5266b82..124fae0 100644
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "1.2c2"
+IDLE_VERSION = "1.2"
diff --git a/Misc/NEWS b/Misc/NEWS
index c260526..06bd3ac 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -4,6 +4,13 @@ Python News
(editors: check NEWS.help for information about editing NEWS using ReST.)
+What's New in Python 2.5 (final)
+================================
+
+*Release date: 19-SEP-2006*
+
+No changes since release candidate 2.
+
What's New in Python 2.5 release candidate 2?
=============================================
diff --git a/Misc/RPM/python-2.5.spec b/Misc/RPM/python-2.5.spec
index 4df60e8..74144c2 100644
--- a/Misc/RPM/python-2.5.spec
+++ b/Misc/RPM/python-2.5.spec
@@ -33,7 +33,7 @@
#################################
%define name python
-%define version 2.5c2
+%define version 2.5
%define libvers 2.5
%define release 1pydotorg
%define __prefix /usr
diff --git a/README b/README
index 655e79f..fd5d4ff 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-This is Python version 2.5 rc 2
-===============================
+This is Python version 2.5
+==========================
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation.
All rights reserved.