From 3daacb57d4a2deeeddddb54cb17fa79f8ffb7abf Mon Sep 17 00:00:00 2001 From: Gary Oberbrunner Date: Sun, 24 Aug 2014 12:34:35 -0400 Subject: Apply 2.3.3 release auto changes to default branch --- QMTest/TestSCons.py | 2 +- README.rst | 16 ++++++++-------- ReleaseConfig | 2 +- SConstruct | 4 ++-- debian/changelog | 12 ++++++++++++ src/Announce.txt | 2 +- src/CHANGES.txt | 2 +- 7 files changed, 26 insertions(+), 14 deletions(-) diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 9434bb1..3c94dcd 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.1.alpha.yyyymmdd' +default_version = '2.3.3' python_version_unsupported = (2, 3, 0) python_version_deprecated = (2, 7, 0) diff --git a/README.rst b/README.rst index 35dc980..56c48e2 100644 --- a/README.rst +++ b/README.rst @@ -480,14 +480,14 @@ following packages will be built:: build/dist/scons-2.0.0-1.noarch.rpm build/dist/scons-2.0.0-1.src.rpm build/dist/scons-2.0.0.linux-i686.tar.gz - build/dist/scons-2.3.1.alpha.yyyymmdd.tar.gz - build/dist/scons-2.3.1.alpha.yyyymmdd.win32.exe - build/dist/scons-2.3.1.alpha.yyyymmdd.zip - build/dist/scons-doc-2.3.1.alpha.yyyymmdd.tar.gz - build/dist/scons-local-2.3.1.alpha.yyyymmdd.tar.gz - build/dist/scons-local-2.3.1.alpha.yyyymmdd.zip - build/dist/scons-src-2.3.1.alpha.yyyymmdd.tar.gz - build/dist/scons-src-2.3.1.alpha.yyyymmdd.zip + 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_1.3.0-1_all.deb The SConstruct file is supposed to be smart enough to avoid trying to build diff --git a/ReleaseConfig b/ReleaseConfig index 6da53b1..92a016c 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, 1, 'alpha', 0) +version_tuple = (2, 3, 3) # 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 3ab4d8c..d07c6cf 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 = 'MONTH YEAR' +month_year = 'August 2014' # # __COPYRIGHT__ @@ -43,7 +43,7 @@ import tempfile import bootstrap project = 'scons' -default_version = '2.3.1.alpha.yyyymmdd' +default_version = '2.3.3' copyright = "Copyright (c) %s The SCons Foundation" % copyright_years platform = distutils.util.get_platform() diff --git a/debian/changelog b/debian/changelog index ec049e1..5e4bf60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +scons (2.3.3) unstable; urgency=low + + * Maintenance release. + + -- Gary Oberbrunner Sun, 24 Aug 2014 21:00:00 -0500 + +scons (2.3.2) unstable; urgency=low + + * Maintenance release. + + -- Gary Oberbrunner Fri, 4 July 2014 21:00:00 -0500 + scons (2.3.0) unstable; urgency=low * Maintenance release. diff --git a/src/Announce.txt b/src/Announce.txt index a749981..e741a20 100644 --- a/src/Announce.txt +++ b/src/Announce.txt @@ -19,7 +19,7 @@ effectively, please go to http://scons.org/lists.php#users to sign up for the scons-users mailing list. -RELEASE 2.3.2.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE +RELEASE 2.3.3 - Sun, 24 Aug 2014 21:08:33 -0400 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 diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 7c5372e..f85e4a2 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -4,7 +4,7 @@ Change Log -RELEASE 2.3.2.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE +RELEASE 2.3.3 - Sun, 24 Aug 2014 21:08:33 -0400 From Roland Stark: - Fixed false line length calculation in the TempFileMunge class (#2970). -- cgit v0.12