From d858df20d0d82eeefbdbe9982cfd68207a0cd446 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 11 Jun 2011 09:58:58 -0500
Subject: bump to 3.1.4

---
 Include/patchlevel.h      | 6 +++---
 Lib/distutils/__init__.py | 2 +-
 Lib/idlelib/idlever.py    | 2 +-
 Misc/NEWS                 | 2 +-
 Misc/RPM/python-3.1.spec  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index db58c5f..3b06447 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -19,11 +19,11 @@
 #define PY_MAJOR_VERSION	3
 #define PY_MINOR_VERSION	1
 #define PY_MICRO_VERSION	4
-#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      	"3.1.4rc1"
+#define PY_VERSION      	"3.1.4"
 /*--end constants--*/
 
 /* Subversion Revision number of this file (not of the repository). Empty
diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py
index 5f8425f..a3e2993 100644
--- a/Lib/distutils/__init__.py
+++ b/Lib/distutils/__init__.py
@@ -15,5 +15,5 @@ __revision__ = "$Id$"
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.1.4rc1"
+__version__ = "3.1.4"
 #--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
index fa89048..09f1b72 100644
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "3.1.4rc1"
+IDLE_VERSION = "3.1.4"
diff --git a/Misc/NEWS b/Misc/NEWS
index 6cf2867..eab5cc9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -5,7 +5,7 @@ Python News
 What's New in Python 3.1.4?
 ===========================
 
-*Release date: 2011-05-XX*
+*Release date: 2011-06-11*
 
 Library
 -------
diff --git a/Misc/RPM/python-3.1.spec b/Misc/RPM/python-3.1.spec
index d3c9bf2..4215cbb 100644
--- a/Misc/RPM/python-3.1.spec
+++ b/Misc/RPM/python-3.1.spec
@@ -34,7 +34,7 @@
 
 %define name python
 #--start constants--
-%define version 3.1.4rc1
+%define version 3.1.4
 %define libvers 3.1
 #--end constants--
 %define release 1pydotorg
-- 
cgit v0.12

