Put default branch back to develop mode, post 2.3.4.

6 files changed, 80 insertions, 19 deletions

diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 3c94dcd..8635f8e 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.3'
+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 f80afd7..599abaf 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.3.tar.gz
-        build/dist/scons-2.3.3.win32.exe
-        build/dist/scons-2.3.3.zip
-        build/dist/scons-doc-2.3.3.tar.gz
-        build/dist/scons-local-2.3.3.tar.gz
-        build/dist/scons-local-2.3.3.zip
-        build/dist/scons-src-2.3.3.tar.gz
-        build/dist/scons-src-2.3.3.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 9d06967..0735012 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, 4, 'alpha', 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
diff --git a/SConstruct b/SConstruct
index d07c6cf..27b07f2 100644
--- a/SConstruct
+++ b/SConstruct
@@ -6,7 +6,7 @@
 copyright_years = '2001 - 2014'
 
 # This gets inserted into the man pages to reflect the month of release.
-month_year = 'August 2014'
+month_year = 'September 2014'
 
 #
 # __COPYRIGHT__
@@ -43,7 +43,7 @@ import tempfile
 import bootstrap
 
 project = 'scons'
-default_version = '2.3.3'
+default_version = '2.3.4'
 copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
 
 platform = distutils.util.get_platform()
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 4207390..1798e36 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -6,6 +6,13 @@
 
 RELEASE  VERSION/DATE TO BE FILLED IN LATER
 
+  From John Doe:
+
+    - Whatever John Doe did.
+
+
+RELEASE 2.3.4 - Mon, 27 Sep 2014 12:50:35 -0400
+
   From Bernhard Walle and Dirk Baechle:
     - Fixed the interactive mode, in connection with
       Configure contexts (#2971).
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index 853456d..1fa033b 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -1,19 +1,73 @@
-  A new SCons checkpoint release, 2.3.4, 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
 
-  This is a bug fix release to fix a regression in EnsureSConsVersion.
+  XXX The primary purpose of this release ... XXX
 
-  Here is a summary of the changes since 2.3.3
+  A SCons "checkpoint release" is intended to provide early access to
+  new features so they can be tested in the field before being released
+  for adoption by other software distributions.
+
+  Note that a checkpoint release is developed using the same test-driven
+  development methodology as all SCons releases.  Existing SCons
+  functionality should all work as it does in previous releases (except
+  for any changes identified in the release notes) and early adopters
+  should be able to use a checkpoint release safely for production work
+  with existing SConscript files.  If not, it represents not only a bug
+  in SCons but also a hole in the regression test suite, and we want to
+  hear about it.
+
+  New features may be more lightly tested than in past releases,
+  especially as concerns their interaction with all of the other
+  functionality in SCons.  We are especially interested in hearing bug
+  reports about new functionality.
+
+  We do not recommend that downstream distributions (Debian, Fedora,
+  etc.) package a checkpoint release, mainly to avoid confusing the
+  "public" release numbering with the long checkpoint release names.
+
+  Here is a summary of the changes since 1.3.0:
+
+  NEW FUNCTIONALITY
+
+    - List new features (presumably why a checkpoint is being released)
+
+  DEPRECATED FUNCTIONALITY
+
+    - List anything that's been deprecated since the last release
+
+  CHANGED/ENHANCED EXISTING FUNCTIONALITY
+
+    - List modifications to existing features, where the previous behavior
+      wouldn't actually be considered a bug
 
   FIXES
 
-    - Fix regression in EnsureSConsVersion
+    - List fixes of outright bugs
+
+  IMPROVEMENTS
+
+    - List improvements that wouldn't be visible to the user in the
+      documentation:  performance improvements (describe the circumstances
+      under which they would be observed), or major code cleanups
+
+  PACKAGING
+
+    - List changes in the way SCons is packaged and/or released
+
+  DOCUMENTATION
+
+    - List any significant changes to the documentation (not individual
+      typo fixes, even if they're mentioned in src/CHANGES.txt to give
+      the contributor credit)
+
+  DEVELOPMENT
+
+    - List visible changes in the way SCons is developed
 
-  Thanks to Anatoly Techtonik and Russel Winder for their
-  contributions to this release.  Contributors are listed
-  alphabetically by their last name.
+  Thanks to CURLY, LARRY, and MOE for their contributions to this release.
+  Contributors are listed alphabetically by their last name.
 
 __COPYRIGHT__
 __FILE__ __REVISION__ __DATE__ __DEVELOPER__