summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony Baxter <anthonybaxter@gmail.com>2006-04-03 15:03:44 (GMT)
committerAnthony Baxter <anthonybaxter@gmail.com>2006-04-03 15:03:44 (GMT)
commitebed3f629b9adedddca4f0d1d3e2408ea560a06f (patch)
tree314c3b8fc510a5411c6352f10983305edbefab09
parent70e079631fa3f01991b63b4250210cecead64e0a (diff)
downloadcpython-ebed3f629b9adedddca4f0d1d3e2408ea560a06f.zip
cpython-ebed3f629b9adedddca4f0d1d3e2408ea560a06f.tar.gz
cpython-ebed3f629b9adedddca4f0d1d3e2408ea560a06f.tar.bz2
preparation for 2.5a1
-rw-r--r--Doc/commontex/boilerplate.tex2
-rw-r--r--Doc/commontex/license.tex2
-rw-r--r--Include/patchlevel.h4
-rw-r--r--LICENSE2
-rw-r--r--Lib/idlelib/NEWS.txt6
-rw-r--r--Lib/idlelib/idlever.py2
-rw-r--r--Misc/NEWS2
-rw-r--r--Misc/RPM/python-2.5.spec (renamed from Misc/RPM/python-2.4.spec)11
-rw-r--r--README2
9 files changed, 20 insertions, 13 deletions
diff --git a/Doc/commontex/boilerplate.tex b/Doc/commontex/boilerplate.tex
index b4c9f48..55a4184 100644
--- 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 525ce8a..dea6514 100644
--- 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 2904fb6..2809454 100644
--- 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 f0fc62a..5affefc 100644
--- 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 31bc19b..8163330 100644
--- 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 eef2885..fbde56c 100644
--- 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 70ed7ca..ad65206 100644
--- 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
index bd4c7f7..3515856 100644
--- 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 fe4c960..beaefca 100644
--- 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.