summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xRELEASE.txt26
-rwxr-xr-xReleaseConfig4
-rw-r--r--SConstruct2
-rwxr-xr-xdebian/changelog6
4 files changed, 30 insertions, 8 deletions
diff --git a/RELEASE.txt b/RELEASE.txt
index 592ed19b5..f736add64 100755
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -129,8 +129,24 @@
rewordings in manpage. Manpage Examples moved to an external
repository / website (scons-cookbook.readthedocs.io).
- 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__
+ Thanks to the following contributors listed below for their contributions to this release.
+
+git shortlog --no-merges -ns 3.1.2..HEAD
+ 290 William Deegan
+ 184 Mats Wichmann
+ 46 Adam Gross
+ 22 Daniel Moody
+ 16 Joseph Brill
+ 15 Dirk Baechle
+ 12 Ivan Kravets
+ 9 Mathew Robinson
+ 6 Paul Tipei
+ 1 Rob Boehne
+ 1 Robert Boehne
+ 1 Daniel
+ 1 Andrew Morrow
+ 1 Iosif Daniel Kurazs
+ 1 James Benton
+ 1 Jeremy Elson
+ 1 Konstantin Gonchar
+ 1 Andrii Doroshenko (Xrayez) \ No newline at end of file
diff --git a/ReleaseConfig b/ReleaseConfig
index 64de6400b..e4ec4f34a 100755
--- a/ReleaseConfig
+++ b/ReleaseConfig
@@ -32,13 +32,13 @@ __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 = (3, 1, 3, 'dev', 0)
+version_tuple = (4,0,0)
# Python versions prior to unsupported_python_version cause a fatal error
# when that version is used. Python versions prior to deprecate_python_version
# cause a warning to be issued (assuming it's not disabled). These values are
# mandatory and must be present in the configuration file.
-unsupported_python_version = (2, 6, 0)
+unsupported_python_version = (2, 7, 0)
deprecated_python_version = (2, 7, 0)
# If release_date is (yyyy, mm, dd, hh, mm, ss), that is used as the release
diff --git a/SConstruct b/SConstruct
index 0ced773fb..15850711f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -37,7 +37,7 @@ month_year = strftime('%B %Y')
project = 'scons'
-default_version = '3.9.9a998'
+default_version = '4.0.0'
copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
#
diff --git a/debian/changelog b/debian/changelog
index 204f6053c..427a55105 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+scons (4.0.0) unstable; urgency=low
+
+ * Maintenance Release
+
+ -- William Deegan <bill@baddogconsulting.com> Mon, 16 Dec 2019 15:04:42 -0700
+
scons (3.1.1) unstable; urgency=low
* Maintenance Release