From a33be624dc2732cdbb483f504e4ed6b280c67ba0 Mon Sep 17 00:00:00 2001 From: Gary Oberbrunner Date: Sun, 2 Mar 2014 17:36:36 -0500 Subject: Final auto updates for 2.3.1 release --- QMTest/TestSCons.py | 2 +- README.rst | 16 ++++++++-------- ReleaseConfig | 2 +- SConstruct | 6 +++--- debian/changelog | 7 +++++++ doc/user/main.xml | 4 ++-- src/Announce.txt | 2 +- src/CHANGES.txt | 2 +- 8 files changed, 24 insertions(+), 17 deletions(-) diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 57b97f9..6b39fa1 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.1' python_version_unsupported = (2, 3, 0) python_version_deprecated = (2, 7, 0) diff --git a/README.rst b/README.rst index a1025ca..6789e68 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.1.tar.gz + build/dist/scons-2.3.1.win32.exe + build/dist/scons-2.3.1.zip + build/dist/scons-doc-2.3.1.tar.gz + build/dist/scons-local-2.3.1.tar.gz + build/dist/scons-local-2.3.1.zip + build/dist/scons-src-2.3.1.tar.gz + build/dist/scons-src-2.3.1.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 2beab02..1bf641f 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, 1) # 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 9dc599e..7517c59 100644 --- a/SConstruct +++ b/SConstruct @@ -3,10 +3,10 @@ # # See the README.rst file for an overview of how SCons is built and tested. -copyright_years = '2001-2014' +copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014' # This gets inserted into the man pages to reflect the month of release. -month_year = 'MONTH YEAR' +month_year = 'March 2014' # # __COPYRIGHT__ @@ -43,7 +43,7 @@ import tempfile import bootstrap project = 'scons' -default_version = '2.3.1.alpha.yyyymmdd' +default_version = '2.3.1' copyright = "Copyright (c) %s The SCons Foundation" % copyright_years platform = distutils.util.get_platform() diff --git a/debian/changelog b/debian/changelog index ec049e1..491cd78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +scons (2.3.1) unstable; urgency=low + + * Maintenance release. + + -- Gary Oberbrunner Sun, 2 Mar 2014 14:00:00 -0500 + + scons (2.3.0) unstable; urgency=low * Maintenance release. diff --git a/doc/user/main.xml b/doc/user/main.xml index 60dd8c9..2186d6f 100644 --- a/doc/user/main.xml +++ b/doc/user/main.xml @@ -74,10 +74,10 @@ Steven Knight - 2004, 2005, 2006, 2007, 2008, 2009, 2010 + 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 - 2004, 2005, 2006, 2007, 2008, 2009, 2010 + 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Steven Knight diff --git a/src/Announce.txt b/src/Announce.txt index cccf6c9..e44f417 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.1.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE +RELEASE 2.3.1 - Mon, 02 Mar 2014 13:53:45 -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 52d8604..4406753 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -4,7 +4,7 @@ Change Log -RELEASE 2.3.1.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE +RELEASE 2.3.1 - Mon, 02 Mar 2014 13:53:45 -0400 From Andrew Featherstone: - Added support for EPUB output format to the DocBook tool. -- cgit v0.12