From 9d637bc1d28420698f4a9345b7579d09cc8c311f Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Thu, 3 Nov 2016 16:25:46 -0400
Subject: manually merge packaging updates from 2.5.1

---
 SConstruct             | 8 +++++---
 src/script/MANIFEST.in | 1 +
 src/setup.py           | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/SConstruct b/SConstruct
index c5734af..0cdf780 100644
--- a/SConstruct
+++ b/SConstruct
@@ -8,7 +8,7 @@ from __future__ import print_function
 copyright_years = '2001 - 2016'
 
 # This gets inserted into the man pages to reflect the month of release.
-month_year = 'April 2016'
+month_year = 'November 2016'
 
 #
 # __COPYRIGHT__
@@ -45,7 +45,7 @@ import tempfile
 import bootstrap
 
 project = 'scons'
-default_version = '2.5.0'
+default_version = '2.5.1'
 copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
 
 platform = distutils.util.get_platform()
@@ -646,6 +646,7 @@ scons_script = {
                             'scons'             : 'scons.py',
                             'sconsign'          : 'sconsign.py',
                             'scons-time'        : 'scons-time.py',
+                            'scons-configure-cache'        : 'scons-configure-cache.py',
                            },
 
         'buildermap'    : {},
@@ -654,6 +655,7 @@ scons_script = {
                             'scons-' + version,
                             'sconsign-' + version,
                             'scons-time-' + version,
+                            'scons-configure-cache-' + version,
                           ],
 
         'explicit_deps' : {
@@ -710,7 +712,7 @@ scons = {
                            },
 }
 
-scripts = ['scons', 'sconsign', 'scons-time']
+scripts = ['scons', 'sconsign', 'scons-time', 'scons-configure-cache']
 
 src_deps = []
 src_files = []
diff --git a/src/script/MANIFEST.in b/src/script/MANIFEST.in
index f324ed4..d10cc82 100644
--- a/src/script/MANIFEST.in
+++ b/src/script/MANIFEST.in
@@ -1,3 +1,4 @@
 scons
 sconsign
 scons-time
+scons-configure-cache
diff --git a/src/setup.py b/src/setup.py
index 9a02b25..41fc35a 100644
--- a/src/setup.py
+++ b/src/setup.py
@@ -388,6 +388,7 @@ scripts = [
     'script/scons',
     'script/sconsign',
     'script/scons-time',
+    'script/scons-configure-cache',
 
     # We include scons.bat in the list of scripts, even on UNIX systems,
     # because we provide an option to allow it be installed explicitly,
-- 
cgit v0.12


From 57dadfa86386231767d10c886e2ab42997107ba0 Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Thu, 3 Nov 2016 16:26:45 -0400
Subject: return file to devel mode

---
 ReleaseConfig   | 2 +-
 src/CHANGES.txt | 7 +++++++
 src/RELEASE.txt | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ReleaseConfig b/ReleaseConfig
index 7a68f89..517b5db 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, 6, 0, 'alpha', 0)
+version_tuple = (2, 7, 0, '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/src/CHANGES.txt b/src/CHANGES.txt
index 4ae9cb2..385f49c 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  VERSION/DATE TO BE FILLED IN LATER
+
   From Daniel Holth:
     - Add basic support for PyPy (by deleting __slots__ from Node with a
       metaclass on PyPy); wrap most-used open() calls in 'with' statements to
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index ac2b95a..d71619d 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -1,4 +1,4 @@
-  A new SCons checkpoint release, 2.6.0.alpha.yyyymmdd, is now available
+  A new SCons checkpoint release, 2.7.0.alpha.yyyymmdd, is now available
   on the SCons download page:
 
           http://www.scons.org/download.php
-- 
cgit v0.12


From 9b969faf4a291d0620822f846d2e45a32367bead Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Sat, 5 Nov 2016 13:16:06 -0400
Subject: add 2.5.1 change info

---
 src/CHANGES.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 385f49c..a6f0f66 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -52,6 +52,14 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Updated Fortran-related tests to pass under GCC 5/6.
     - Fixed SCons.Tool.Packaging.rpm.package source nondeterminism across builds.
 
+RELEASE 2.5.1 - Mon, 03 Nov 2016 13:37:42 -0400
+
+  From William Deegan:
+    - Add scons-configure-cache.py to packaging. It was omitted
+
+  From Alexey Klimkin:
+    - Use memoization to optimize PATH evaluation across all dependencies per
+      node. (PR #345)
 
 RELEASE 2.5.0 - Mon, 09 Apr 2016 11:27:42 -0700
 
-- 
cgit v0.12