reverting 3320

8 files changed, 19 insertions, 39 deletions

diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index bf8f9fed..923e319a 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.final.0'
+default_version = '2.3.4'
 
 python_version_unsupported = (2, 3, 0)
 python_version_deprecated = (2, 7, 0)
diff --git a/README.rst b/README.rst
index fa832a04..599abafd 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.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.4.tar.gz
+        build/dist/scons-2.3.4.win32.exe
+        build/dist/scons-2.3.4.zip
+        build/dist/scons-doc-2.3.4.tar.gz
+        build/dist/scons-local-2.3.4.tar.gz
+        build/dist/scons-local-2.3.4.zip
+        build/dist/scons-src-2.3.4.tar.gz
+        build/dist/scons-src-2.3.4.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 70af3e46..07350123 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, 3, 5, 'final', 0)
+version_tuple = (2, 3, 5, 'alpha', 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 - 2014'
 
 # Local Variables:
 # tab-width:4
diff --git a/SConstruct b/SConstruct
index f5a3e7fb..abf5fa8a 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 - 2014'
 
 # This gets inserted into the man pages to reflect the month of release.
-month_year = 'June 2015'
+month_year = 'September 2014'
 
 #
 # __COPYRIGHT__
@@ -43,7 +43,7 @@ import tempfile
 import bootstrap
 
 project = 'scons'
-default_version = '2.3.5.final.0'
+default_version = '2.3.4'
 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 d2c4c183..a1657776 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 - 2014</pubdate>
 
     <copyright>
-      <year>2004 - 2015</year>
+      <year>2004 - 2014</year>
       <holder>The SCons Foundation</holder>
     </copyright>
 
diff --git a/src/Announce.txt b/src/Announce.txt
index 882ab456..7c6fdd54 100644
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -19,33 +19,13 @@ effectively, please go to http://scons.org/lists.php#users to sign up for
 the scons-users mailing list.
 
 
-RELEASE 2.3.5.final.0 - Mon, 15 Jun 2015 09:38:27 -0700
+RELEASE VERSION/DATE TO BE FILLED IN LATER
 
   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
   since last release.  This announcement highlights only the important
   changes.
 
-  Please note the following important changes since release 2.3.4:
-
-    -- Extended docs for InstallVersionedLib/SharedLibrary,
-    -- Fixed symlink support (PR #227, #2395).
-    -- Fixed incomplete LIBS flattening and substitution in
-       Program scanner(PR #205, #2954).
-    -- Added new method rentry_exists_on_disk to Node.FS (PR #193).
-    -- Add support for f08 file extensions for Fortran 2008 code.
-    -- Show --config choices if no argument is specified (PR #202).
-    -- Fixed build crash when XML toolchain isn't installed, and
-       activated compression for ZIP archives.
-    -- Fix for VersionedSharedLibrary under 'sunos' platform.
-    -- Fixed dll link with precompiled headers on MSVC 2012
-    -- Added an 'exclude' parameter to Glob()
-    -- Support for multiple cmdargs (one per variant) in VS project files.
-    -- Various improvements for TempFileMunge class.
-    -- Added an implementation for Visual Studio users files (PR #209).
-    -- Added support for the 'PlatformToolset' tag in VS project files (#2978).
-    -- Added support for '-isystem' to ParseFlags.
-
   Please note the following important changes since release 2.3.3:
 
     -- Fix for EnsureSConsVersion regression in 2.3.3.
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 90769ff3..ef4e016b 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -4,7 +4,7 @@
 
                             Change Log
 
-RELEASE 2.3.5.final.0 - Mon, 15 Jun 2015 09:38:27 -0700
+RELEASE  VERSION/DATE TO BE FILLED IN LATER
 
   From Stephen Pollard:
     - Documentation fixes for libraries.xml and
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index 3506b12d..1fa033b1 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -1,4 +1,4 @@
-  A new SCons checkpoint release, 2.3.5.final.0, is now available
+  A new SCons checkpoint release, 2.3.5.alpha.yyyymmdd, is now available
   on the SCons download page:
 
           http://www.scons.org/download.php