summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2014-03-02 17:36:36 -0500
committerGary Oberbrunner <garyo@oberbrunner.com>2014-03-02 17:36:36 -0500
commita33be624dc2732cdbb483f504e4ed6b280c67ba0 (patch)
tree0810b6e2e8b368208b9d02b0d99991f2692240c7
parentd53067ce68e14f2d39a62e342a86d2881154b8e3 (diff)
downloadscons-git-a33be624dc2732cdbb483f504e4ed6b280c67ba0.tar.gz
Final auto updates for 2.3.1 release
-rw-r--r--QMTest/TestSCons.py2
-rw-r--r--README.rst16
-rw-r--r--ReleaseConfig2
-rw-r--r--SConstruct6
-rw-r--r--debian/changelog7
-rw-r--r--doc/user/main.xml4
-rw-r--r--src/Announce.txt2
-rw-r--r--src/CHANGES.txt2
8 files changed, 24 insertions, 17 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 57b97f99e..6b39fa1f2 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 a1025ca14..6789e68fc 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 2beab0232..1bf641f62 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 9dc599e7b..7517c59b1 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 ec049e1ca..491cd7811 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+scons (2.3.1) unstable; urgency=low
+
+ * Maintenance release.
+
+ -- Gary Oberbrunner <garyo@oberbrunner.com> 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 60dd8c921..2186d6fb5 100644
--- a/doc/user/main.xml
+++ b/doc/user/main.xml
@@ -74,10 +74,10 @@
<corpauthor>Steven Knight</corpauthor>
- <pubdate>2004, 2005, 2006, 2007, 2008, 2009, 2010</pubdate>
+ <pubdate>2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014</pubdate>
<copyright>
- <year>2004, 2005, 2006, 2007, 2008, 2009, 2010</year>
+ <year>2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014</year>
<holder>Steven Knight</holder>
</copyright>
diff --git a/src/Announce.txt b/src/Announce.txt
index cccf6c9d8..e44f417eb 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 52d8604e1..4406753b8 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.