preparation for 2.5a1

diff --git a/Doc/commontex/boilerplate.tex b/Doc/commontex/boilerplate.tex
index b4c9f480da30e71d99c5cd84cdaafbea44b35e89..55a41848913c0a3f16cea907998f19c5a3fc9852 100644 (file)
--- a/Doc/commontex/boilerplate.tex
+++ b/Doc/commontex/boilerplate.tex
@@ -5,5 +5,5 @@
        Email: \email{docs@python.org}
 }
 
-\date{\today}                  % XXX update before final release!
+\date{5th April 2006}                  % XXX update before final release!
 \input{patchlevel}             % include Python version information

diff --git a/Doc/commontex/license.tex b/Doc/commontex/license.tex
index 525ce8a1b8a2036ffa44a7322ce4a0b4a4c1d585..dea6514c0329c98f539a519105cfbb06e146dbdd 100644 (file)
--- a/Doc/commontex/license.tex
+++ b/Doc/commontex/license.tex
@@ -49,6 +49,8 @@ GPL-compatible; the table below summarizes the various releases.
   \linev{2.4}{2.3}{2004}{PSF}{yes}
   \linev{2.4.1}{2.4}{2005}{PSF}{yes}
   \linev{2.4.2}{2.4.1}{2005}{PSF}{yes}
+  \linev{2.4.3}{2.4.2}{2006}{PSF}{yes}
+  \linev{2.5}{2.4}{2006}{PSF}{yes}
 \end{tablev}
 
 \note{GPL-compatible doesn't mean that we're distributing

diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 2904fb6b3a56baf16316b85fac38cbe045f3e893..2809454bf8e73dd0c4026e5eaa60b2d95043fa6f 100644 (file)
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -23,10 +23,10 @@
 #define PY_MINOR_VERSION       5
 #define PY_MICRO_VERSION       0
 #define PY_RELEASE_LEVEL       PY_RELEASE_LEVEL_ALPHA
-#define PY_RELEASE_SERIAL      0
+#define PY_RELEASE_SERIAL      1
 
 /* Version as a string */
-#define PY_VERSION             "2.5a0"
+#define PY_VERSION             "2.5a1"
 
 /* Subversion Revision number of this file (not of the repository) */
 #define PY_PATCHLEVEL_REVISION  "$Revision$"

diff --git a/LICENSE b/LICENSE
index f0fc62a6c2f8c51664a46abb9483aa33da6badc7..5affefc9fcd51f4404c637b8cd321ab6fe5ea8a6 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -51,6 +51,8 @@ the various releases.
     2.4             2.3         2004        PSF         yes
     2.4.1           2.4         2005        PSF         yes
     2.4.2           2.4.1       2005        PSF         yes
+    2.4.3           2.4.2       2006        PSF         yes
+    2.5             2.4         2006        PSF         yes
 
 Footnotes:
 

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 31bc19b25d861d530a65421cd15c0e66b755f587..8163330a1d96d9b8e4a6b6f8fd1c17387ef71fed 100644 (file)
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -1,7 +1,7 @@
-What's New in IDLE 1.2a0?
-=======================
+What's New in IDLE 1.2a1?
+=========================
 
-*Release date: XX-XXX-2006*
+*Release date: 05-APR-2006*
 
 - Source file f.flush() after writing; trying to avoid lossage if user
   kills GUI.

diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
index eef2885f461c4fe3d3d547dc481bdfa94f305901..fbde56c7c7649b95f4058263db33af4c37bb502c 100644 (file)
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "1.2a0"
+IDLE_VERSION = "1.2a1"

diff --git a/Misc/NEWS b/Misc/NEWS
index 70ed7cacedcea88bde2966d6c209d534859d1d8f..ad65206b7b97f04f2206eec8713cc1f911118ced 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -7,7 +7,7 @@ Python News
 What's New in Python 2.5 alpha 1?
 =================================
 
-*Release date: XX-XXX-2006*
+*Release date: 05-APR-2006*
 
 Core and builtins
 -----------------

diff --git a/Misc/RPM/python-2.4.spec b/Misc/RPM/python-2.5.spec
similarity index 98%
rename from Misc/RPM/python-2.4.spec
rename to Misc/RPM/python-2.5.spec
index bd4c7f73ad674c8f150fe6df2660ed2744f38dc6..3515856f7c2658a46b2fa5794090fd5a6499dc0b 100644 (file)
--- a/Misc/RPM/python-2.4.spec
+++ b/Misc/RPM/python-2.5.spec
@@ -6,7 +6,7 @@
 #  "python2"?
 #WARNING: Commenting out doesn't work.  Last line is what's used.
 %define config_binsuffix none
-%define config_binsuffix 2.4
+%define config_binsuffix 2.5
 
 #  Build tkinter?  "auto" enables it if /usr/bin/wish exists.
 #WARNING: Commenting out doesn't work.  Last line is what's used.
@@ -33,9 +33,9 @@
 #################################
 
 %define name python
-%define version 2.4
-%define libvers 2.4
-%define release 2pydotorg
+%define version 2.5a1
+%define libvers 2.5
+%define release 1pydotorg
 %define __prefix /usr
 
 #  kludge to get around rpm <percent>define weirdness
@@ -62,6 +62,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: expat-devel
 BuildPrereq: db4-devel
 BuildPrereq: gdbm-devel
+BuildPrereq: sqlite-devel
 Prefix: %{__prefix}
 Packager: Sean Reifschneider <jafo-rpms@tummy.com>
 
@@ -354,6 +355,8 @@ rm -f mainpkg.files tools.files
 %{__prefix}/%{libdirname}/python%{libvers}/test
 %{__prefix}/%{libdirname}/python%{libvers}/xml
 %{__prefix}/%{libdirname}/python%{libvers}/email
+%{__prefix}/%{libdirname}/python%{libvers}/email/mime
+%{__prefix}/%{libdirname}/python%{libvers}/sqlite3
 %{__prefix}/%{libdirname}/python%{libvers}/compiler
 %{__prefix}/%{libdirname}/python%{libvers}/bsddb
 %{__prefix}/%{libdirname}/python%{libvers}/hotshot

diff --git a/README b/README
index fe4c9606e1d2636ecd1519407d218ec942465a9d..beaefcaff8f701efc27c041a4bba0ce650f9bbb3 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is Python version 2.5 alpha 0
+This is Python version 2.5 alpha 1
 ==================================
 
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation.