2022 pretest start

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

12 files changed, 44 insertions, 35 deletions

diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm
index d80063c895e..670541ade61 100644
--- a/Master/tlpkg/TeXLive/TLConfig.pm
+++ b/Master/tlpkg/TeXLive/TLConfig.pm
@@ -62,7 +62,7 @@ BEGIN {
 
 # the year of our release, will be used in the location of the
 # network packages, and in menu names, and other places.
-our $ReleaseYear = 2021;
+our $ReleaseYear = 2022;
 
 # users can upgrade from this year to the current year; might be the
 # same as the release year, or any number of releases earlier.
diff --git a/Master/tlpkg/bin/tl-update-images b/Master/tlpkg/bin/tl-update-images
index 08c84a601e3..19676eeec7f 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-2021 Karl Berry.
+# Copyright 2007-2022 Karl Berry.
 # Copyright 2003, 2004, 2005 Sebastian Rahtz.
 #
 # This file is licensed under the GNU General Public License version 2
@@ -18,7 +18,7 @@ unset CDPATH  # avoid output from cd
 umask 022
 
 NAME=texlive
-V=2021
+V=2022
 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 82c459fd33e..301b6ba07bc 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=2021			\
+	--package-version=2022			\
 	--package-name="TeX Live"		\
         -k__ -k\$__ -k%__ -k__x -k__n:1,2 -k__nx:1,2 -k__xn:1,2 -kN__ -k  \
        texmf-dist/scripts/texlive/tlmgrgui.pl \
diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet
index 73c0d92569e..b04f3c54169 100755
--- a/Master/tlpkg/bin/tl-update-tlnet
+++ b/Master/tlpkg/bin/tl-update-tlnet
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright 2008-2021 Norbert Preining
+# Copyright 2008-2022 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=2021
+yyyy=2022
 
 check_consistency=true
 chicken=false
@@ -186,7 +186,7 @@ tlpdbopt_install_srcfiles 1
 tlpdbopt_create_formats 1
 instopt_letter 0
 instopt_adjustpath 0
-instopt_adjustrepo 1
+instopt_adjustrepo 0
 " >texlive.profile
 
 # silence envvar warnings and the welcome message.
diff --git a/Master/tlpkg/doc/graphics/GNUmakefile b/Master/tlpkg/doc/graphics/GNUmakefile
index cea5f86f609..571c06efb57 100644
--- a/Master/tlpkg/doc/graphics/GNUmakefile
+++ b/Master/tlpkg/doc/graphics/GNUmakefile
@@ -1,6 +1,8 @@
 # $Id$
 # Public domain. Originally written by Norbert Preining, 2018.
 
+all: texlive-installer-graphics-vert.png
+
 texlive-installer-graphics-vert.png: texlive-installer-graphics-horiz.png
 	convert $< -rotate 270 $@
 
@@ -10,8 +12,9 @@ texlive-installer-graphics-horiz.png: texlive-installer-graphics.pdf
 texlive-installer-graphics.pdf: texlive-installer-graphics.tex tl-lion-black.pdf
 	texfot pdflatex '\nonstopmode\input $<'
 
-texlive.png: texlive-installer-graphics-vert.png
-	convert $< -scale 97x480 $@
+# no longer used
+#texlive.png: texlive-installer-graphics-vert.png
+#	convert $< -scale 97x480 $@
 
 clean:
 	-rm -f texlive-installer-graphics.{pdf,aux,log,png}
diff --git a/Master/tlpkg/doc/graphics/texlive-installer-graphics-horiz.png b/Master/tlpkg/doc/graphics/texlive-installer-graphics-horiz.png
index 67f2a66f961..e71422307a4 100644
--- a/Master/tlpkg/doc/graphics/texlive-installer-graphics-horiz.png
+++ b/Master/tlpkg/doc/graphics/texlive-installer-graphics-horiz.png
diff --git a/Master/tlpkg/doc/graphics/texlive-installer-graphics-vert.png b/Master/tlpkg/doc/graphics/texlive-installer-graphics-vert.png
index e338f78736f..da1968e21c4 100644
--- a/Master/tlpkg/doc/graphics/texlive-installer-graphics-vert.png
+++ b/Master/tlpkg/doc/graphics/texlive-installer-graphics-vert.png
diff --git a/Master/tlpkg/doc/graphics/texlive-installer-graphics.pdf b/Master/tlpkg/doc/graphics/texlive-installer-graphics.pdf
index b41dd43f3b4..ff21d75c6d0 100644
--- a/Master/tlpkg/doc/graphics/texlive-installer-graphics.pdf
+++ b/Master/tlpkg/doc/graphics/texlive-installer-graphics.pdf
diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index 0220a01ef10..c5331cddf6b 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -79,16 +79,16 @@ The branch must be created right before the first pretest-specific
 commit (which is the next item, in Part II).
 
   cd /home/texlive/branch
-  rm -rf * .svn # clean out completely; trunk should also be clean
-  rev=57871 # for 2021 (svn info in trunk)
-  tlyear=`date +%Y -d "last year"` # presumably
+  rm -rf * .[^.]* # be sure .svn et al. are gone
+  rev=62180 # for 2022 (svn info in trunk)
+  tlyear=`date +%Y -d "last year"`; echo $tlyear # previous release
   umask 022 # keep TL files non-group-writable
   branch=branch$tlyear.final
   svn copy -r $rev \
     -m"$branch branch based on r$rev" \
     svn://tug.org/texlive/trunk svn://tug.org/texlive/branches/$branch
   # make working checkout:
-  svn co svn://tug.org/texlive/branches/$branch . >&out # ~30min
+  svn co svn://tug.org/texlive/branches/$branch . >&out # ~45min
 
 Do not create it earlier and merge from trunk, because then all the
 packages which got updated in the meantime, and have been updated in
@@ -101,7 +101,7 @@ and get updated again.
 0. Ensure that /home/texlive/branch from before last pretest-specific
 commit is created, clean, and up to date: see item 6 just above.
 
-0b. In crontab, disable trunk->tlnet entries.
+0b. In crontab, comment out "update tlnet from trunk" entry.
 
 1. When ready to start building tlpretest: on trunk, set
   option adjustrepo 0
@@ -109,14 +109,14 @@ in tl-update-tlnet since pretest users shouldn't go to CTAN for updates.
 This change should not go to the branch.
 
 1b. Set up tlpretest:
-Update /home/ftp/texlive/tlpretest/README.
+Update /home/ftp/texlive/tlpretest/README.md.
 Empty tlpretest except for that README and 00_TIME.txt (used for mirmon).
 
 2. Prepare for pretest in cron.tl:
+uncomment "# enable check during pretest" block.
 critical=--critical	 # tlcritical needed for new release version
-pretest=--pretest	 # update tlpretest, not tlnet (if not frozen)
-catalogue_compare=false  # just for the initial test, will set below
-net_frozen=true 	 # update tlnet|tlpretest (per $pretest)
+catalogue_compare=false  # avoid for initial test, will set below
+net_frozen=true 	 # stay local for now, no update of tlpretest
 First build happens below, after many more changes; don't start it yet.
 
 4. After setting up for pretest (not before), basic updates for release year:
@@ -138,28 +138,27 @@ Master/texmf-dist/web2c/texmf.cnf  # from Build/.../kpathsea
 Then install new binaries with tl-update-bindir. Ask tlbuild.
 Add new executables to appropriate .tlpsrc files (likewise removals).
   (svn status bin/x86_64-linux | grep '^[^M]')
+Add any man pages for the new executables (from Build/source/inst/...)
 Add new scripts to linked_scripts if not already handled.
 
-6. Run tex \\end to check that mktexfmt works. 
-Also run fmtutil-user --all to check that all formats build, no config file
-problems.  Ensure that web2c/texmf.cnf is updated for the current year
-(per above).  Then, so things will get redone later as another check:
-  rm -rf ~/.texlive`date +%Y`  # the new one
-(For karl@tug.org: create at least pdflatex.fmt and xelatex.fmt for bnb.)
+6. Run tex \\end to check that dynamic mktexfmt works. 
+Ensure that web2c/texmf.cnf is updated for the current year (per above).
+
+6a. Then run fmtutil-user --all to check that all formats build.
+
+6b. (For karl@tug.org: leave new ~karl/.texlive`date +%Y` for bnb,
+and update ~bnb/.cshrc after commit.)
 
 7. Check for Build-maintained updates to config files, new files, etc.
 (might have to merge back if Master was mistakenly updated):
   diff -ru0 --exclude=man --exclude=info \
     Build/source/inst/texmf-dist Master/texmf-dist
 
-7a. If new cjk release:
-cd Master/texmf-dist/doc
-for p in *conv hbf2gf; do cp /home/ftp/tex-archive/language/chinese/CJK/cjk-X.Y.Z/doc/pdf/$p.pdf $p; done
-
 8. Now, finally, try a first update of tlpretest:
-  force_rebuild=true cron.pretest
+  env force_rebuild=true ~karl/bin/cron.pretest
 This will fail because the pretest dir is not yet set up, but
 that's ok; the idea is to check the output and ensure all is basically ok.
+The complaints about unknown "svn status output line"s are ok.
 It's likely that .tlpsrc files will need to be adjusted for new binaries.
 
 8a. svn commit all the above.
diff --git a/Master/tlpkg/tlpsrc/cweb.tlpsrc b/Master/tlpkg/tlpsrc/cweb.tlpsrc
index 1a78e291105..54cef6e063a 100644
--- a/Master/tlpkg/tlpsrc/cweb.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cweb.tlpsrc
@@ -6,7 +6,8 @@ binpattern f bin/${ARCH}/cweave
 binpattern f bin/${ARCH}/ctwill
 binpattern f bin/${ARCH}/ctwill-refsort
 binpattern f bin/${ARCH}/ctwill-twinx
-#
+binpattern f bin/${ARCH}/twill
+
 docpattern +f texmf-dist/doc/man/man1/ctangle.*
 docpattern +f texmf-dist/doc/man/man1/cweave.*
 docpattern +f texmf-dist/doc/man/man1/cweb.*
@@ -14,4 +15,5 @@ docpattern +f texmf-dist/doc/man/man1/cweb.*
 docpattern +f texmf-dist/doc/man/man1/ctwill.*
 docpattern +f texmf-dist/doc/man/man1/ctwill-refsort.*
 docpattern +f texmf-dist/doc/man/man1/ctwill-twinx.*
-
+#
+docpattern +f texmf-dist/doc/man/man1/twill.*
diff --git a/Master/tlpkg/tlpsrc/hitex.tlpsrc b/Master/tlpkg/tlpsrc/hitex.tlpsrc
new file mode 100644
index 00000000000..4e5e25e7d8f
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/hitex.tlpsrc
@@ -0,0 +1,8 @@
+binpattern f bin/${ARCH}/hishrink
+binpattern f bin/${ARCH}/histretch
+binpattern f bin/${ARCH}/hitex
+
+docpattern f doc/man/man1/hishrink.1
+docpattern f doc/man/man1/histretch.1
+docpattern f doc/man/man1/hitex.1
+
diff --git a/Master/tlpkg/translations/ru.po b/Master/tlpkg/translations/ru.po
index bfb85902ccd..204ceb3bccd 100644
--- a/Master/tlpkg/translations/ru.po
+++ b/Master/tlpkg/translations/ru.po
@@ -672,7 +672,7 @@ msgstr "Размер листа по умолчанию для всех"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1350
 msgid "A4"
-msgstr "A4"
+msgstr "А4"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1352
 msgid "Letter"
@@ -2070,9 +2070,6 @@ msgstr ""
 #~ "Если нужно что-то изменить, нажмите кнопку «Назад»,\n"
 #~ "если всё в порядке, нажмите кнопку «Установить»."
 
-#~ msgid "A4"
-#~ msgstr "А4"
-
 #~ msgid "Please select a different mirror."
 #~ msgstr "Выберите другое зеркало."