summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-02-29 23:16:52 +0000
committerKarl Berry <karl@freefriends.org>2020-02-29 23:16:52 +0000
commit76d83bb0d8142d66765c4c8f418296ab9343aa78 (patch)
tree3299f1ee42b2ee9bc83cd1599dad84099c8187ae /Master
parentc82ddbbe1c3aae78dbcf77573549b2eaa39fd669 (diff)
revert to 2019 for one more regular build
git-svn-id: svn://tug.org/texlive/trunk@53977 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/.mkisofsrc2
-rw-r--r--Master/release-texlive.txt2
-rw-r--r--Master/texmf-dist/web2c/texmf.cnf8
-rw-r--r--Master/texmf-dist/web2c/texmfcnf.lua4
-rw-r--r--Master/tlpkg/TeXLive/TLConfig.pm6
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm4
-rwxr-xr-xMaster/tlpkg/bin/tl-update-images4
-rwxr-xr-xMaster/tlpkg/bin/tl-update-messages2
-rwxr-xr-xMaster/tlpkg/bin/tl-update-tlnet6
-rw-r--r--Master/tlpkg/doc/graphics/texlive-installer-graphics-horiz.pngbin16590 -> 17794 bytes
-rw-r--r--Master/tlpkg/doc/graphics/texlive-installer-graphics-vert.pngbin17026 -> 18428 bytes
-rw-r--r--Master/tlpkg/doc/graphics/texlive-installer-graphics.pdfbin129433 -> 129702 bytes
-rw-r--r--Master/tlpkg/installer/texlive.pngbin15441 -> 15879 bytes
13 files changed, 19 insertions, 19 deletions
diff --git a/Master/.mkisofsrc b/Master/.mkisofsrc
index ede69bfb78b..e2a2d19ede9 100644
--- a/Master/.mkisofsrc
+++ b/Master/.mkisofsrc
@@ -1,4 +1,4 @@
APPI=Complete TeX system
COPY=LICENSE.TL
PUBL=TeX Live <tex-live@tug.org>
-VOLI=TeXLive2020
+VOLI=TeXLive2019
diff --git a/Master/release-texlive.txt b/Master/release-texlive.txt
index c6a1adc7a34..56da08ae2a6 100644
--- a/Master/release-texlive.txt
+++ b/Master/release-texlive.txt
@@ -1,4 +1,4 @@
-TeX Live (https://tug.org/texlive) version 2020
+TeX Live (http://tug.org/texlive) version 2019
This file is public domain. It is read by install-tl --version,
tlmgr --version, and texconfig conf, and a final line appended with
diff --git a/Master/texmf-dist/web2c/texmf.cnf b/Master/texmf-dist/web2c/texmf.cnf
index 8ec2f429197..9de38920fd5 100644
--- a/Master/texmf-dist/web2c/texmf.cnf
+++ b/Master/texmf-dist/web2c/texmf.cnf
@@ -4,8 +4,8 @@
% If you modify this original file, YOUR CHANGES WILL BE LOST when it is
% updated. Instead, put your changes -- and only your changes, not an
% entire copy! -- in ../../texmf.cnf. That is, if this file is
-% installed in /some/path/to/texlive/2020/texmf-dist/web2c/texmf.cnf,
-% add your custom settings to /some/path/to/texlive/2020/texmf.cnf.
+% installed in /some/path/to/texlive/2019/texmf-dist/web2c/texmf.cnf,
+% add your custom settings to /some/path/to/texlive/2019/texmf.cnf.
% (Below, we use YYYY in place of the specific year.)
%
% What follows is a super-summary of what this .cnf file can
@@ -84,10 +84,10 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
TEXMFHOME = ~/texmf
% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2020/texmf-var
+TEXMFVAR = ~/.texlive2019/texmf-var
% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2020/texmf-config
+TEXMFCONFIG = ~/.texlive2019/texmf-config
% This is the value manipulated by tlmgr's auxtrees subcommand in the
% root texmf.cnf. Kpathsea warns about a literally empty string for a
diff --git a/Master/texmf-dist/web2c/texmfcnf.lua b/Master/texmf-dist/web2c/texmfcnf.lua
index 9382ffeb137..8ffe928a520 100644
--- a/Master/texmf-dist/web2c/texmfcnf.lua
+++ b/Master/texmf-dist/web2c/texmfcnf.lua
@@ -45,13 +45,13 @@ return {
-- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live
TEXMFSYSVAR = "selfautoparent:texmf-var",
- TEXMFVAR = "home:.texlive2020/texmf-var",
+ TEXMFVAR = "home:.texlive2019/texmf-var",
-- We have only one cache path but there can be more. The first writable one
-- will be chosen but there can be more readable paths.
TEXMFCACHE = "$TEXMFSYSVAR;$TEXMFVAR",
- TEXMFCONFIG = "home:.texlive2020/texmf-config",
+ TEXMFCONFIG = "home:.texlive2019/texmf-config",
-- I don't like this texmf under home and texmf-home would make more
-- sense. One never knows what installers put under texmf anywhere and
diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm
index b9e339cdd3e..14f2cbc166f 100644
--- a/Master/tlpkg/TeXLive/TLConfig.pm
+++ b/Master/tlpkg/TeXLive/TLConfig.pm
@@ -57,11 +57,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 = 2020;
+$ReleaseYear = 2019;
# users can upgrade from this year to the current year; might be the
# same as the release year, or any number of releases earlier.
-# Generally not tested, but should be.
+# Generally not tested.
$MinRelease = 2016;
# Meta Categories do not ship files, but only call for other packages.
@@ -161,7 +161,7 @@ our %TLPDBConfigs = (
"container_format" => $DefaultCompressorFormat,
"minrelease" => $MinRelease,
"release" => $ReleaseYear,
- "frozen" => 0,
+ "frozen" => 1,
);
# definition of the option strings and their value types
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 409304c980f..d4ad4a4b47f 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -337,7 +337,7 @@ sub platform_name {
# We don't use uname numbers here.)
#
# this changes each year, per above:
- my $mactex_darwin = 13; # lowest minor rev supported by x86_64-darwin.
+ my $mactex_darwin = 12; # lowest minor rev supported by x86_64-darwin.
#
# Most robust approach is apparently to check sw_vers (os version,
# returns "10.x" values), and sysctl (processor hardware).
@@ -413,7 +413,7 @@ sub platform_desc {
'universal-darwin' => 'MacOSX universal binaries',
'win32' => 'Windows',
'x86_64-cygwin' => 'Cygwin on x86_64',
- 'x86_64-darwin' => 'MacOSX current (10.13-) on x86_64',
+ 'x86_64-darwin' => 'MacOSX current (10.12-) on x86_64',
'x86_64-darwinlegacy' => 'MacOSX legacy (10.6-) on x86_64',
'x86_64-linux' => 'GNU/Linux on x86_64',
'x86_64-linuxmusl' => 'GNU/Linux on x86_64 with musl',
diff --git a/Master/tlpkg/bin/tl-update-images b/Master/tlpkg/bin/tl-update-images
index 4348b58811a..72a9b623835 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-2020 Karl Berry.
+# Copyright 2007-2019 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=2020
+V=2019
D=`date +%Y%m%d`
target=/home/ftp/texlive/Images/test
diff --git a/Master/tlpkg/bin/tl-update-messages b/Master/tlpkg/bin/tl-update-messages
index 453bdc232bc..4d290326cd4 100755
--- a/Master/tlpkg/bin/tl-update-messages
+++ b/Master/tlpkg/bin/tl-update-messages
@@ -23,7 +23,7 @@ cat install-tl >>$tmpfile
xgettext -o tlpkg/translations/messages.pot \
--copyright-holder="TeX Live Team" \
--msgid-bugs-address=tex-live@tug.org \
- --package-version=2020 \
+ --package-version=2019 \
--package-name="TeX Live" \
-k__ -k\$__ -k%__ -k__x -k__n:1,2 -k__nx:1,2 -k__xn:1,2 -kN__ -k \
tlpkg/installer/tracked-install.pl \
diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet
index 649e632d289..b7e83037b24 100755
--- a/Master/tlpkg/bin/tl-update-tlnet
+++ b/Master/tlpkg/bin/tl-update-tlnet
@@ -1,5 +1,5 @@
#!/bin/sh -e
-# Copyright 2008-2020 Norbert Preining
+# Copyright 2008-2019 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
@@ -13,7 +13,7 @@ renice 20 $$ >/dev/null 2>&1
unset CDPATH
unset LS_COLORS
-yyyy=2020
+yyyy=2019
check_consistency=true
chicken=false
@@ -145,7 +145,7 @@ tlpdbopt_install_srcfiles 1
tlpdbopt_create_formats 1
instopt_letter 0
instopt_adjustpath 0
-instopt_adjustrepo 0
+instopt_adjustrepo 1
" >texlive.profile
# silence envvar warnings and the welcome message.
diff --git a/Master/tlpkg/doc/graphics/texlive-installer-graphics-horiz.png b/Master/tlpkg/doc/graphics/texlive-installer-graphics-horiz.png
index e02c89936c2..1553576ce8d 100644
--- a/Master/tlpkg/doc/graphics/texlive-installer-graphics-horiz.png
+++ b/Master/tlpkg/doc/graphics/texlive-installer-graphics-horiz.png
Binary files differ
diff --git a/Master/tlpkg/doc/graphics/texlive-installer-graphics-vert.png b/Master/tlpkg/doc/graphics/texlive-installer-graphics-vert.png
index 8cfe304b75a..eb8b46b8423 100644
--- a/Master/tlpkg/doc/graphics/texlive-installer-graphics-vert.png
+++ b/Master/tlpkg/doc/graphics/texlive-installer-graphics-vert.png
Binary files differ
diff --git a/Master/tlpkg/doc/graphics/texlive-installer-graphics.pdf b/Master/tlpkg/doc/graphics/texlive-installer-graphics.pdf
index cb05422882b..3d886f0038e 100644
--- a/Master/tlpkg/doc/graphics/texlive-installer-graphics.pdf
+++ b/Master/tlpkg/doc/graphics/texlive-installer-graphics.pdf
Binary files differ
diff --git a/Master/tlpkg/installer/texlive.png b/Master/tlpkg/installer/texlive.png
index 0d7e4ebba17..eb8603ab6b9 100644
--- a/Master/tlpkg/installer/texlive.png
+++ b/Master/tlpkg/installer/texlive.png
Binary files differ