summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-12-23 13:18:53 +0000
committerMartin v. Löwis <martin@v.loewis.de>2008-12-23 13:18:53 +0000
commit50dbd5a5004cf23e8760de332865f0e44eb793c5 (patch)
treea264c30e2996e2e86e802bb968997c5aafcb339d
parentf61590d0438a12b98923c368fae671e268938d5a (diff)
downloadcpython-50dbd5a5004cf23e8760de332865f0e44eb793c5.tar.gz
Prepare for 2.5.4.v2.5.4
-rw-r--r--Doc/commontex/boilerplate.tex2
-rw-r--r--Include/patchlevel.h4
-rw-r--r--Lib/idlelib/NEWS.txt5
-rw-r--r--Lib/idlelib/idlever.py2
-rw-r--r--Misc/NEWS2
-rw-r--r--README2
-rw-r--r--Tools/msi/uuids.py1
7 files changed, 12 insertions, 6 deletions
diff --git a/Doc/commontex/boilerplate.tex b/Doc/commontex/boilerplate.tex
index 481fab0e02..ae8c67dd90 100644
--- a/Doc/commontex/boilerplate.tex
+++ b/Doc/commontex/boilerplate.tex
@@ -5,5 +5,5 @@
Email: \email{docs@python.org}
}
-\date{19th December, 2008} % XXX update before final release!
+\date{23rd December, 2008} % XXX update before final release!
\input{patchlevel} % include Python version information
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 552cf02649..db28568467 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 4
-#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_ALPHA
+#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL
#define PY_RELEASE_SERIAL 0
/* Version as a string */
-#define PY_VERSION "2.5.3+"
+#define PY_VERSION "2.5.4"
/* 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 7528e4631f..c88f54bbc7 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -1,3 +1,8 @@
+What's New in IDLE 1.2.4?
+=========================
+
+*Release date: 23-Dec-2008*
+
What's New in IDLE 1.2.3?
=========================
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
index 1ffd7a7ed7..385327d7c6 100644
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "1.2.3"
+IDLE_VERSION = "1.2.4"
diff --git a/Misc/NEWS b/Misc/NEWS
index d4cce5b3c8..bfb9eb163b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -7,7 +7,7 @@ Python News
What's New in Python 2.5.4?
===========================
-*Release date: XX-XXX-2009*
+*Release date: 23-Dec-2008*
Core and builtins
-----------------
diff --git a/README b/README
index 758ce3ecac..ece68c4709 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is Python version 2.5.3
+This is Python version 2.5.4
============================
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Python Software
diff --git a/Tools/msi/uuids.py b/Tools/msi/uuids.py
index 642bd64ed7..2b3831face 100644
--- a/Tools/msi/uuids.py
+++ b/Tools/msi/uuids.py
@@ -37,4 +37,5 @@ product_codes = {
'2.5.2150':'{6b976adf-8ae8-434e-b282-a06c7f624d2f}', # 2.5.2
'2.5.3121':'{bcd1d908-027a-4724-bee1-039900cdda7e}', # 2.5.3c1
'2.5.3150':'{d5cf2397-1d36-4e1f-9756-fab15e383b31}', # 2.5.3
+ '2.5.4150':'{2e0dfc24-7c4b-4dcf-bcc7-81c513bed3bc}', # 2.5.4
}