diff options
author | Karl Berry <karl@freefriends.org> | 2015-04-12 15:20:30 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-04-12 15:20:30 +0000 |
commit | 70026c3c818170e14d1cea1156cf40f328ee9f6d (patch) | |
tree | c5ce24c224cea00478ed36dc11cc76f51436d537 /Master/tlpkg | |
parent | f4eeefac4175916b6911ae7e89f5ff898181340c (diff) |
version/year updates for TeX Live 2015
git-svn-id: svn://tug.org/texlive/trunk@36787 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r-- | Master/tlpkg/TeXLive/TLConfig.pm | 6 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLUtils.pm | 2 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tl-update-images | 4 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tl-update-tlnet | 6 | ||||
-rw-r--r-- | Master/tlpkg/doc/releng.txt | 12 | ||||
-rw-r--r-- | Master/tlpkg/installer/texlive.png | bin | 15070 -> 15773 bytes | |||
-rw-r--r-- | Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc | 2 |
7 files changed, 17 insertions, 15 deletions
diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm index 0ea72e519d4..ed8a060ade7 100644 --- a/Master/tlpkg/TeXLive/TLConfig.pm +++ b/Master/tlpkg/TeXLive/TLConfig.pm @@ -1,6 +1,6 @@ # $Id$ # TeXLive::TLConfig.pm - module exporting configuration values -# Copyright 2007-2014 Norbert Preining +# Copyright 2007-2015 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. @@ -55,11 +55,11 @@ BEGIN { # the year of our release, will be used in the location of the # network packages, and in menu names, and other places. -$ReleaseYear = 2014; +$ReleaseYear = 2015; # users can upgrade from this year to the current year; maybe a spread # of more than one year will be useful at some point, but not now. -$MinRelease = 2013; # upgrade from 2013 to 2015 might work? +$MinRelease = 2013; # upgrade from 2013 to 2015 should work, we'll see # users can NOT upgrade due to internal changes, force a full installation #$MinRelease = $ReleaseYear; diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index 21193f79347..5a91cd67e95 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -1,6 +1,6 @@ # $Id$ # TeXLive::TLUtils.pm - the inevitable utilities for TeX Live. -# Copyright 2007-2014 Norbert Preining, Reinhard Kotucha +# Copyright 2007-2015 Norbert Preining, Reinhard Kotucha # This file is licensed under the GNU General Public License version 2 # or any later version. diff --git a/Master/tlpkg/bin/tl-update-images b/Master/tlpkg/bin/tl-update-images index 5ba5a6de65a..377af7cb85e 100755 --- a/Master/tlpkg/bin/tl-update-images +++ b/Master/tlpkg/bin/tl-update-images @@ -2,7 +2,7 @@ # $Id$ # Create the .iso image(s) for TeX Live. # -# Copyright 2007-2014 Karl Berry. +# Copyright 2007-2015 Karl Berry. # Copyright 2003, 2004, 2005 Sebastian Rahtz. # # This file is licensed under the GNU General Public License version 2 @@ -12,7 +12,7 @@ # Historical notes at the end of the script. NAME=texlive -V=2014 +V=2015 D=`date +%Y%m%d` target=/home/ftp/texlive/Images/test diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet index 320e76efe3a..6f9397d51f3 100755 --- a/Master/tlpkg/bin/tl-update-tlnet +++ b/Master/tlpkg/bin/tl-update-tlnet @@ -1,5 +1,5 @@ #!/bin/sh -e -# Copyright 2008-2014 Norbert Preining +# Copyright 2008-2015 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. # @@ -9,7 +9,7 @@ vc_id='$Id$' unset CDPATH unset LS_COLORS -yyyy=2014 +yyyy=2015 check_consistency=true chicken=false @@ -119,7 +119,7 @@ option_fmt 1 option_letter 0 option_src 1 option_path 0 -option_adjustrepo 1 +option_adjustrepo 0 " >texlive.profile # silence warnings we do not need to see. diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt index f80109e6ba4..745552ffd0b 100644 --- a/Master/tlpkg/doc/releng.txt +++ b/Master/tlpkg/doc/releng.txt @@ -47,17 +47,19 @@ to CTAN for updates. 3. The next nightly build will update tlpretest, or run force_rebuild=true cron.tl -(but good to do the next steps first). +(but do the next steps first). 4. Basic updates for release year (to start pretest): Master/.mkisofsrc Master/release-texlive.txt Master/tlpkg/TeXLive/TLConfig.pm (including MinRelease) Master/tlpkg/bin/tl-update-tlnet +Master/tlpkg/bin/tl-update-images Master/tlpkg/installer/texlive.png Master/texmf-dist/web2c/texmfcnf.lua Master/texmf-dist/web2c/texmf.cnf # from Build/.../kpathsea -(check other copyright years in *.pm, tlmgr*, install-tl) +(check/update other copyright years in *.pm, tlmgr*, install-tl) +Build/source/{version.ac,texk/{kpathsea,ptexenc}/configure.ac: no /dev 5. After committing, see if formats build, to check for config file problems. Then rm -rf ~/.texlive`date +%Y` # the new one @@ -132,8 +134,8 @@ Making the big release: umount /home/ftp/texlive/Contents/live hx=/home/ftp/historic/systems/texlive -prev=2013 -this=2014 +prev=2014 +this=2015 mkdir $hx/$this cd /home/ftp/texlive/Images @@ -213,7 +215,7 @@ svn copy -r 34252 -m'branch2014 branch based on r34252' \ cd /home/texlive rm -rf branch # when starting a new year on tug mkdir branch; cd branch -svn co file:///home/svn/texlive/branches/branch2014/Build/source . >&out +svn co file:///home/svn/texlive/branches/branch2015/Build/source . >&out When bug fixes are done, i.e., at another stable point, make another tag: #svn copy -r 30858 -m'texlive-2013.1 tag based on r30858, with rebuilt binaries (only)' \ diff --git a/Master/tlpkg/installer/texlive.png b/Master/tlpkg/installer/texlive.png Binary files differindex 0ef34ba9fca..347d5968df3 100644 --- a/Master/tlpkg/installer/texlive.png +++ b/Master/tlpkg/installer/texlive.png diff --git a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc index 4ae9ebe4e4c..7388ce178b3 100644 --- a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc +++ b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc @@ -45,4 +45,4 @@ depend opt_write18_restricted:1 # the day we want to freeze a release forever, set this to 1 and tlmgr # will then bail out saying that TLNNNN is frozen. -depend opt_frozen:1 +depend opt_frozen:0 |