updates for 2.4.0 release

4 files changed, 32 insertions, 46 deletions

diff --git a/debian/changelog b/debian/changelog
index b161db10..7311f786 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+scons (2.4.0) unstable; urgency=low
+
+  * Maintenance release.
+
+ -- William Deegan <bill@baddogconsulting.com>  Mon, 21 Sep 2015 08:56:00 -0700
+
 scons (2.3.6) unstable; urgency=low
 
   * Maintenance release.
diff --git a/src/Announce.txt b/src/Announce.txt
index f96e703c..1d597021 100644
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -18,9 +18,8 @@ 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.
 
-==============IMPORTANT NOTICE FOR NEXT VERSION V2.4.0===========
+==============IMPORTANT NOTICE===========
 
-PLEASE READ. CHANGES COMING IN NEXT MAJOR RELEASE V2.4.0
 As has been pre-announced in SCons's mailing lists:
 
 * https://pairlist4.pair.net/pipermail/scons-users/2014-July/002734.html ,
@@ -37,13 +36,16 @@ released. Especially if you are directly using the Node class.
 =================================================================
 
 
-RELEASE VERSION/DATE TO BE FILLED IN LATER
+RELEASE 2.4.0 - Mon, 21 Sep 2015 08:56:00 -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
   since last release.  This announcement highlights only the important
   changes.
 
+  Please note the following important changes since release 2.3.6:
+    - Switch several core classes to use "slots" to reduce memory
+      usage. (PR #2180, #2178, #2198)
 
   Please note the following important changes since release 2.3.5:
     - Support for Visual Studio 2015
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 977d00f3..0299718c 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -4,15 +4,18 @@
 
                             Change Log
 
-RELEASE  VERSION/DATE TO BE FILLED IN LATER
+RELEASE 2.4.0 - Mon, 21 Sep 2015 08:56:00 -0700
 
   From Dirk Baechle:
-    - Switched several core classes to using "slots", for
-      reducing the overall memory consumption in large
+    - Switched several core classes to use "slots", to
+      reduce the overall memory consumption in large
       projects (fixes #2180, #2178, #2198)
     - Memoizer counting uses decorators now, instead of
       the old metaclasses approach.
 
+  From Andrew Featherstone
+    - Fixed typo in SWIGPATH description
+
 RELEASE 2.3.6 - Mon, 31 Jul 2015 14:35:03 -0700
 
   From Rob Smith:
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index 83212a70..0bb481d3 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -1,72 +1,47 @@
-  A new SCons checkpoint release, 2.3.8.alpha.yyyymmdd, is now available
+  A new SCons release, 2.4.0, is now available
   on the SCons download page:
 
           http://www.scons.org/download.php
 
-  XXX The primary purpose of this release ... XXX
-
-  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:
+  Here is a summary of the changes since 2.3.6:
 
   NEW FUNCTIONALITY
 
-    - List new features (presumably why a checkpoint is being released)
+    - None
 
   DEPRECATED FUNCTIONALITY
 
-    - List anything that's been deprecated since the last release
+    - None
 
   CHANGED/ENHANCED EXISTING FUNCTIONALITY
 
-    - List modifications to existing features, where the previous behavior
-      wouldn't actually be considered a bug
+    - None
 
   FIXES
 
-    - List fixes of outright bugs
+    - None
 
   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
+    - Switched several core classes to use "slots", to
+      reduce the overall memory consumption in large
+      projects (fixes #2180, #2178, #2198)
+    - Memoizer counting uses decorators now, instead of
+      the old metaclasses approach.
 
   PACKAGING
 
-    - List changes in the way SCons is packaged and/or released
+    - Added new amd64 windows 64 bit installer
 
   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)
+    - None
 
   DEVELOPMENT
 
-    - List visible changes in the way SCons is developed
+    - None
 
-  Thanks to CURLY, LARRY, and MOE for their contributions to this release.
+  Thanks to Dirk Baechle, Andrew Featherstone for their contributions to this release.
   Contributors are listed alphabetically by their last name.
 
 __COPYRIGHT__