diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-11-04 08:46:46 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-11-04 08:46:46 +0100 |
commit | 4c7fed99e5554ba71d62987c0ec5f1302011b122 (patch) | |
tree | 250e3df1c8840e7b8c0838db52a98d8622cb4103 /bin | |
parent | 301edd26f23e3d954dcea5cffc1ad13f969822ca (diff) |
New upstream version 2.5.1+repackupstream/2.5.1+repack
Diffstat (limited to 'bin')
-rw-r--r-- | bin/import-test.py | 2 | ||||
-rw-r--r-- | bin/linecount.py | 2 | ||||
-rw-r--r-- | bin/restore.sh | 20 | ||||
-rw-r--r-- | bin/update-release-info.py | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/bin/import-test.py b/bin/import-test.py index 6182afc..eb93828 100644 --- a/bin/import-test.py +++ b/bin/import-test.py @@ -25,7 +25,7 @@ # """ triple-quotes will need to have their contents edited by hand. # -__revision__ = "bin/import-test.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "bin/import-test.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os.path import sys diff --git a/bin/linecount.py b/bin/linecount.py index 64cd855..147089a 100644 --- a/bin/linecount.py +++ b/bin/linecount.py @@ -23,7 +23,7 @@ # interesting one for most purposes. from __future__ import division -__revision__ = "bin/linecount.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "bin/linecount.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os.path diff --git a/bin/restore.sh b/bin/restore.sh index 9ec0e1e..4b96852 100644 --- a/bin/restore.sh +++ b/bin/restore.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # -# Simple hack script to restore __revision__, __COPYRIGHT_, 2.5.0 +# Simple hack script to restore __revision__, __COPYRIGHT_, 2.5.1 # and other similar variables to what gets checked in to source. This # comes in handy when people send in diffs based on the released source. # @@ -24,7 +24,7 @@ for i in `find $DIRS -name '*.py'`; do ed $i <<EOF g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001 - 2016 The SCons Foundation/p w -/^__revision__ = /s/= .*/= "bin/restore.sh rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog"/p +/^__revision__ = /s/= .*/= "bin/restore.sh rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog"/p w q EOF @@ -35,7 +35,7 @@ for i in `find $DIRS -name 'scons.bat'`; do ed $i <<EOF g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001 - 2016 The SCons Foundation/p w -/^@REM src\/script\/scons.bat/s/@REM .* knight/@REM bin/restore.sh rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog/p +/^@REM src\/script\/scons.bat/s/@REM .* knight/@REM bin/restore.sh rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog/p w q EOF @@ -44,13 +44,13 @@ done for i in `find $DIRS -name '__init__.py' -o -name 'scons.py' -o -name 'sconsign.py'`; do header $i ed $i <<EOF -/^__version__ = /s/= .*/= "2.5.0"/p +/^__version__ = /s/= .*/= "2.5.1"/p w -/^__build__ = /s/= .*/= "rel_2.5.0:3543:937e55cd78f7[MODIFIED]"/p +/^__build__ = /s/= .*/= "rel_2.5.1:3735:9dc6cee5c168[MODIFIED]"/p w -/^__buildsys__ = /s/= .*/= "ubuntu1404-32bit"/p +/^__buildsys__ = /s/= .*/= "mongodog"/p w -/^__date__ = /s/= .*/= "2016/04/09 11:29:54"/p +/^__date__ = /s/= .*/= "2016/11/03 14:02:02"/p w /^__developer__ = /s/= .*/= "bdbaddog"/p w @@ -61,7 +61,7 @@ done for i in `find $DIRS -name 'setup.py'`; do header $i ed $i <<EOF -/^ *version = /s/= .*/= "2.5.0",/p +/^ *version = /s/= .*/= "2.5.1",/p w q EOF @@ -72,9 +72,9 @@ for i in `find $DIRS -name '*.txt'`; do ed $i <<EOF g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001 - 2016 The SCons Foundation/p w -/# [^ ]* 0.96.[CD][0-9]* [0-9\/]* [0-9:]* knight$/s/.*/# bin/restore.sh rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog/p +/# [^ ]* 0.96.[CD][0-9]* [0-9\/]* [0-9:]* knight$/s/.*/# bin/restore.sh rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog/p w -/Version [0-9][0-9]*\.[0-9][0-9]*/s//Version 2.5.0/p +/Version [0-9][0-9]*\.[0-9][0-9]*/s//Version 2.5.1/p w q EOF diff --git a/bin/update-release-info.py b/bin/update-release-info.py index 4b60d9d..aee481e 100644 --- a/bin/update-release-info.py +++ b/bin/update-release-info.py @@ -57,7 +57,7 @@ In 'post' mode, files are prepared for the next release cycle: # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -__revision__ = "bin/update-release-info.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "bin/update-release-info.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os import sys |