partially undo r53569, moving mktexlsr and {updmap,fmtutil}-hdr.* back to texlive.infra to keep it sufficiently self-contained for install-tl; doc updates

git-svn-id: svn://tug.org/texlive/trunk@53576 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 26 insertions, 5 deletions

diff --git a/Master/texmf-dist/scripts/texlive/NEWS b/Master/texmf-dist/scripts/texlive/NEWS
index bdf2a3080b1..3e8b7ee5483 100644
--- a/Master/texmf-dist/scripts/texlive/NEWS
+++ b/Master/texmf-dist/scripts/texlive/NEWS
@@ -1,6 +1,11 @@
 (This file public domain.  Originally written by Norbert Preining and
 Karl Berry, 2010.)
 
+<p><b>tlmgr 53428 (released 17jan20):</b>
+<li>automatic retry of packages that fail to download.
+<li>rearrange packaging so little-used scripts are not part of
+infraonly; remove tetex package.
+
 <p><b>tlmgr 53225 (released 25dec19):</b>
 <li>avoid doubled .rNNN in backup container names.
 <li>warning when chosen installation root (TEXDIR) has problematic characters.
diff --git a/Master/texmf-dist/scripts/texlive/README b/Master/texmf-dist/scripts/texlive/README
index 3076f63941e..4758e0a84f0 100644
--- a/Master/texmf-dist/scripts/texlive/README
+++ b/Master/texmf-dist/scripts/texlive/README
@@ -29,6 +29,18 @@ Another reason is that almost all scripts in the bin/*/ directories are
 now symlinks into texmf-dist/scripts/, so it's nice for these to follow
 suit for consistency and clarity.
 
+Summary of packages maintained as part of TeX Live,
+and whether they are included in scheme-infraonly:
+----------------------------------------------------
+texlive.infra - infraonly, core (tlmgr and support),
+  changes only pushed as a critical update.
+kpathsea - infraonly, binaries (kpsewhich) and non-user-visible scripts,
+  binaries only rebuilt for the annual release.
+texlive-scripts - infraonly, important scripts (fmtutil, updmap,
+  mktexlsr, ...), changes pushed normally.
+texlive-scripts-extra - not infraonly, little-used scripts (allcm, allec,
+  texconfig, ...), changes pushed normally.
+
 The principal mailing list is http://lists.tug.org/tex-live.
 
 All of these scripts are free software, mostly public domain.
diff --git a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
index 0742b79dbff..2eb19c7cd13 100644
--- a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
@@ -11,9 +11,8 @@ docpattern f texmf-dist/scripts/texlive/README
 runpattern f texmf-dist/dvips/tetex/*
 runpattern f texmf-dist/fonts/enc/dvips/tetex/*
 runpattern f texmf-dist/fonts/map/dvips/tetex/*
-runpattern f texmf-dist/web2c/fmtutil-hdr.cnf
 runpattern f texmf-dist/web2c/updmap.cfg
-runpattern f texmf-dist/web2c/updmap-hdr.cfg
+#
 # This two-entry map file was written by te and is maintained in the
 # tetex directory.
 execute addMap mathpple.map
@@ -21,7 +20,6 @@ execute addMap mathpple.map
 runpattern f texmf-dist/scripts/texlive/fmtutil-sys.sh
 runpattern f texmf-dist/scripts/texlive/fmtutil-user.sh
 runpattern f texmf-dist/scripts/texlive/fmtutil.pl
-runpattern f texmf-dist/scripts/texlive/mktexlsr
 runpattern f texmf-dist/scripts/texlive/mktexlsr.pl
 runpattern f texmf-dist/scripts/texlive/mktexmf
 runpattern f texmf-dist/scripts/texlive/mktexpk
@@ -35,7 +33,6 @@ runpattern f texmf-dist/scripts/texlive/updmap.pl
 binpattern f bin/${ARCH}/fmtutil
 binpattern f bin/${ARCH}/fmtutil-sys
 binpattern f bin/${ARCH}/fmtutil-user
-binpattern f bin/${ARCH}/mktexlsr
 binpattern f bin/${ARCH}/mktexmf
 binpattern f bin/${ARCH}/mktexpk
 binpattern f bin/${ARCH}/mktextfm
@@ -49,7 +46,6 @@ binpattern f bin/${ARCH}/texhash
 #
 docpattern f texmf-dist/doc/man/man1/fmtutil*
 docpattern f texmf-dist/doc/man/man1/mktexfmt.*
-docpattern f texmf-dist/doc/man/man1/mktexlsr.*
 docpattern f texmf-dist/doc/man/man1/mktexmf.*
 docpattern f texmf-dist/doc/man/man1/mktexpk.*
 docpattern f texmf-dist/doc/man/man1/mktextfm.*
diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
index 24541bfef3c..28c52ecb0bb 100644
--- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
@@ -11,6 +11,7 @@ docpattern f README*
 docpattern d readme-html.dir
 docpattern d readme-txt.dir
 docpattern f index.html
+docpattern f texmf-dist/doc/man/man1/mktexlsr.*
 docpattern f texmf-dist/doc/man/man1/tlmgr.*
 docpattern f texmf-dist/scripts/texlive/NEWS
 docpattern f tlpkg/README
@@ -21,6 +22,12 @@ docpattern f tlpkg/installer/COPYING.MinGW-runtime.txt
 runpattern f LICENSE*
 runpattern f release-texlive.txt
 #
+# TLUtils.pm::_create_config_files uses these as part of install-tl,
+# so put them here to keep texlive.infra self-contained.
+runpattern f texmf-dist/web2c/fmtutil-hdr.cnf
+runpattern f texmf-dist/web2c/updmap-hdr.cfg
+#
+runpattern f texmf-dist/scripts/texlive/mktexlsr
 runpattern f texmf-dist/scripts/texlive/tlmgr.pl
 runpattern f texmf-dist/scripts/texlive/tlmgrgui.pl
 runpattern f texmf-dist/scripts/texlive/uninstall-win32.pl
@@ -32,6 +39,7 @@ runpattern d tlpkg/TeXLive
 runpattern d tlpkg/gpg
 
 binpattern f bin/${ARCH}/tlmgr
+binpattern f bin/${ARCH}/mktexlsr
 # 
 binpattern f/win32 bin/win32/runscript.*
 binpattern f/win32 bin/win32/wrunscript.*