reverting 3321

7 files changed, 14 insertions, 15 deletions

diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index bae96e6e..bf8f9fed 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -34,7 +34,7 @@ from TestCmd import PIPE
 # here provides some independent verification that what we packaged
 # conforms to what we expect.
 
-default_version = '2.3.5'
+default_version = '2.3.5.final.0'
 
 python_version_unsupported = (2, 3, 0)
 python_version_deprecated = (2, 7, 0)
diff --git a/README.rst b/README.rst
index 5e9dcb8e..fa832a04 100644
--- a/README.rst
+++ b/README.rst
@@ -480,14 +480,14 @@ following packages will be built::
         build/dist/scons-2.3.3-1.noarch.rpm
         build/dist/scons-2.3.3-1.src.rpm
         build/dist/scons-2.3.3.linux-i686.tar.gz
-        build/dist/scons-2.3.5.tar.gz
-        build/dist/scons-2.3.5.win32.exe
-        build/dist/scons-2.3.5.zip
-        build/dist/scons-doc-2.3.5.tar.gz
-        build/dist/scons-local-2.3.5.tar.gz
-        build/dist/scons-local-2.3.5.zip
-        build/dist/scons-src-2.3.5.tar.gz
-        build/dist/scons-src-2.3.5.zip
+        build/dist/scons-2.3.5.final.0.tar.gz
+        build/dist/scons-2.3.5.final.0.win32.exe
+        build/dist/scons-2.3.5.final.0.zip
+        build/dist/scons-doc-2.3.5.final.0.tar.gz
+        build/dist/scons-local-2.3.5.final.0.tar.gz
+        build/dist/scons-local-2.3.5.final.0.zip
+        build/dist/scons-src-2.3.5.final.0.tar.gz
+        build/dist/scons-src-2.3.5.final.0.zip
         build/dist/scons_2.3.3-1_all.deb
 
 The SConstruct file is supposed to be smart enough to avoid trying to build
diff --git a/ReleaseConfig b/ReleaseConfig
index e899d939..70af3e46 100644
--- a/ReleaseConfig
+++ b/ReleaseConfig
@@ -32,8 +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, 3, 5, 'final', 0)
-version_tuple = (2, 3, 5 )
+version_tuple = (2, 3, 5, 'final', 0)
 
 # Python versions prior to unsupported_python_version cause a fatal error
 # when that version is used.  Python versions prior to deprecate_python_version
diff --git a/SConstruct b/SConstruct
index bbddd988..f5a3e7fb 100644
--- a/SConstruct
+++ b/SConstruct
@@ -43,7 +43,7 @@ import tempfile
 import bootstrap
 
 project = 'scons'
-default_version = '2.3.5'
+default_version = '2.3.5.final.0'
 copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
 
 platform = distutils.util.get_platform()
diff --git a/src/Announce.txt b/src/Announce.txt
index c9c379ad..882ab456 100644
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -19,7 +19,7 @@ effectively, please go to http://scons.org/lists.php#users to sign up for
 the scons-users mailing list.
 
 
-RELEASE 2.3.5 - Mon, 15 Jun 2015 11:53:37 -0700
+RELEASE 2.3.5.final.0 - Mon, 15 Jun 2015 09:38:27 -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 d54d83e4..90769ff3 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -4,7 +4,7 @@
 
                             Change Log
 
-RELEASE 2.3.5 - Mon, 15 Jun 2015 11:53:37 -0700
+RELEASE 2.3.5.final.0 - Mon, 15 Jun 2015 09:38:27 -0700
 
   From Stephen Pollard:
     - Documentation fixes for libraries.xml and
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index 587c01ee..3506b12d 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -1,4 +1,4 @@
-  A new SCons checkpoint release, 2.3.5, is now available
+  A new SCons checkpoint release, 2.3.5.final.0, is now available
   on the SCons download page:
 
           http://www.scons.org/download.php