changes for 2.5.0 release

8 files changed, 31 insertions, 31 deletions

diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 43832e8..b71ee62 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -34,9 +34,9 @@ from TestCmd import PIPE
 # here provides some independent verification that what we packaged
 # conforms to what we expect.
 
-default_version = '2.4.2.alpha.yyyymmdd'
+default_version = '2.5.0'
 
-python_version_unsupported = (2, 3, 0)
+python_version_unsupported = (2, 6, 0)
 python_version_deprecated = (2, 7, 0)
 
 # In the checked-in source, the value of SConsVersion in the following
diff --git a/README.rst b/README.rst
index b4b24b7..ba1755f 100644
--- a/README.rst
+++ b/README.rst
@@ -168,7 +168,7 @@ Or on Windows::
 
 By default, the above commands will do the following:
 
-- Install the version-numbered "scons-2.4.1" and "sconsign-2.4.1" scripts in
+- Install the version-numbered "scons-2.5.0" and "sconsign-2.5.0" scripts in
   the default system script directory (/usr/bin or C:\\Python\*\\Scripts, for
   example).  This can be disabled by specifying the "--no-version-script"
   option on the command line.
@@ -180,23 +180,23 @@ By default, the above commands will do the following:
   before making it the default on your system.
 
   On UNIX or Linux systems, you can have the "scons" and "sconsign" scripts be
-  hard links or symbolic links to the "scons-2.4.1" and "sconsign-2.4.1"
+  hard links or symbolic links to the "scons-2.5.0" and "sconsign-2.5.0"
   scripts by specifying the "--hardlink-scons" or "--symlink-scons" options on
   the command line.
 
-- Install "scons-2.4.1.bat" and "scons.bat" wrapper scripts in the Python
+- Install "scons-2.5.0.bat" and "scons.bat" wrapper scripts in the Python
   prefix directory on Windows (C:\\Python\*, for example).  This can be disabled
   by specifying the "--no-install-bat" option on the command line.
 
   On UNIX or Linux systems, the "--install-bat" option may be specified to
-  have "scons-2.4.1.bat" and "scons.bat" files installed in the default system
+  have "scons-2.5.0.bat" and "scons.bat" files installed in the default system
   script directory, which is useful if you want to install SCons in a shared
   file system directory that can be used to execute SCons from both UNIX/Linux
   and Windows systems.
 
 - Install the SCons build engine (a Python module) in an appropriate
-  version-numbered SCons library directory (/usr/lib/scons-2.4.0 or
-  C:\\Python\*\\scons-2.4.0, for example).  See below for more options related to
+  version-numbered SCons library directory (/usr/lib/scons-2.5.0 or
+  C:\\Python\*\\scons-2.5.0, for example).  See below for more options related to
   installing the build engine library.
 
 - Install the troff-format man pages in an appropriate directory on UNIX or
@@ -474,7 +474,7 @@ running all of "runtest.py -a".
 Building Packages
 =================
 
-We use SCons (version 2.4.1 or later) to build its own packages.  If you
+We use SCons (version 2.5.0 or later) to build its own packages.  If you
 already have an appropriate version of SCons installed on your system, you can
 build everything by simply running it::
 
@@ -489,18 +489,18 @@ about `Executing SCons Without Installing`_)::
 Depending on the utilities installed on your system, any or all of the
 following packages will be built::
 
-        build/dist/scons-2.4.1-1.noarch.rpm
-        build/dist/scons-2.4.1-1.src.rpm
-        build/dist/scons-2.4.1.linux-i686.tar.gz
-        build/dist/scons-2.4.2.alpha.yyyymmdd.tar.gz
-        build/dist/scons-2.4.2.alpha.yyyymmdd.win32.exe
-        build/dist/scons-2.4.2.alpha.yyyymmdd.zip
-        build/dist/scons-doc-2.4.2.alpha.yyyymmdd.tar.gz
-        build/dist/scons-local-2.4.2.alpha.yyyymmdd.tar.gz
-        build/dist/scons-local-2.4.2.alpha.yyyymmdd.zip
-        build/dist/scons-src-2.4.2.alpha.yyyymmdd.tar.gz
-        build/dist/scons-src-2.4.2.alpha.yyyymmdd.zip
-        build/dist/scons_2.4.1-1_all.deb
+        build/dist/scons-2.5.0-1.noarch.rpm
+        build/dist/scons-2.5.0-1.src.rpm
+        build/dist/scons-2.5.0.linux-i686.tar.gz
+        build/dist/scons-2.5.0.tar.gz
+        build/dist/scons-2.5.0.win32.exe
+        build/dist/scons-2.5.0.zip
+        build/dist/scons-doc-2.5.0.tar.gz
+        build/dist/scons-local-2.5.0.tar.gz
+        build/dist/scons-local-2.5.0.zip
+        build/dist/scons-src-2.5.0.tar.gz
+        build/dist/scons-src-2.5.0.zip
+        build/dist/scons_2.5.0-1_all.deb
 
 The SConstruct file is supposed to be smart enough to avoid trying to build
 packages for which you don't have the proper utilities installed.  For
diff --git a/ReleaseConfig b/ReleaseConfig
index e1f462a..a4bfce6 100644
--- a/ReleaseConfig
+++ b/ReleaseConfig
@@ -32,7 +32,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 # 'final', the patchlevel is set to the release date.  This value is
 # mandatory and must be present in this file.
 #version_tuple = (2, 2, 0, 'final', 0)
-version_tuple = (2, 4, 2, 'alpha', 0)
+version_tuple = (2, 5, 0)
 
 # Python versions prior to unsupported_python_version cause a fatal error
 # when that version is used.  Python versions prior to deprecate_python_version
@@ -51,7 +51,7 @@ deprecated_python_version = (2, 7, 0)
 #month_year = 'December 2012'
 
 # If copyright years is not given, the release year is used as the end.
-copyright_years = '2001 - 2015'
+copyright_years = '2001 - 2016'
 
 # Local Variables:
 # tab-width:4
diff --git a/SConstruct b/SConstruct
index 6ad6dd9..33a8680 100644
--- a/SConstruct
+++ b/SConstruct
@@ -3,10 +3,10 @@
 #
 # See the README.rst file for an overview of how SCons is built and tested.
 
-copyright_years = '2001 - 2015'
+copyright_years = '2001 - 2016'
 
 # This gets inserted into the man pages to reflect the month of release.
-month_year = 'MONTH YEAR'
+month_year = 'April 2016'
 
 #
 # __COPYRIGHT__
@@ -43,7 +43,7 @@ import tempfile
 import bootstrap
 
 project = 'scons'
-default_version = '2.4.2.alpha.yyyymmdd'
+default_version = '2.5.0'
 copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
 
 platform = distutils.util.get_platform()
diff --git a/doc/user/main.xml b/doc/user/main.xml
index d2c4c18..451f87d 100644
--- a/doc/user/main.xml
+++ b/doc/user/main.xml
@@ -74,10 +74,10 @@
 
     <corpauthor>Steven Knight and the SCons Development Team</corpauthor>
 
-    <pubdate>2004 - 2015</pubdate>
+    <pubdate>2004 - 2016</pubdate>
 
     <copyright>
-      <year>2004 - 2015</year>
+      <year>2004 - 2016</year>
       <holder>The SCons Foundation</holder>
     </copyright>
 
diff --git a/src/Announce.txt b/src/Announce.txt
index 266988f..b16fb3b 100644
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -18,7 +18,7 @@ So that everyone using SCons can help each other learn how to use it more
 effectively, please go to http://scons.org/lists.php#users to sign up for
 the scons-users mailing list.
 
-RELEASE VERSION/DATE TO BE FILLED IN LATER
+RELEASE 2.5.0 - Mon, 09 Apr 2016 11:27:42 -0700
 
   Please consult the RELEASE.txt file for a summary of changes since the last
   release and consult the CHANGES.txt file for complete a list of changes
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 7f8da6c..b5a1fb6 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -4,7 +4,7 @@
 
                             Change Log
 
-RELEASE  VERSION/DATE TO BE FILLED IN LATER
+RELEASE 2.5.0 - Mon, 09 Apr 2016 11:27:42 -0700
 
   From Dirk Baechle:
     - Removed a lot of compatibility methods and workarounds
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index 2c99cca..32d5a08 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -1,4 +1,4 @@
-  A new SCons checkpoint release, 2.4.3.alpha.yyyymmdd, is now available
+  A new SCons checkpoint release, 2.5.0, is now available
   on the SCons download page:
 
           http://www.scons.org/download.php