diff options
| author | Karl Berry <karl@freefriends.org> | 2013-04-07 18:58:34 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2013-04-07 18:58:34 +0000 |
| commit | 25fe101524f8eb688fb883418111c0a216bfb0c6 (patch) | |
| tree | b30c8a5bef846507b1acf07a23a4b9830c2eab21 | |
| parent | 335c72669537f06bbf2b4b6e2248fae60c4f38a9 (diff) | |
first updates for TL13 pretest, and for texmf-dist having everything
git-svn-id: svn://tug.org/texlive/trunk@29725 c570f23f-e606-0410-a88d-b1316a301751
118 files changed, 463 insertions, 464 deletions
diff --git a/Master/.mkisofsrc b/Master/.mkisofsrc index 652b3f8cf1a..76232032064 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=TeXLive2012 +VOLI=TeXLive2013 diff --git a/Master/release-texlive.txt b/Master/release-texlive.txt index 4f090f1770f..b3db442294c 100644 --- a/Master/release-texlive.txt +++ b/Master/release-texlive.txt @@ -1,4 +1,4 @@ -TeX Live (http://tug.org/texlive) version 2012 +TeX Live (http://tug.org/texlive) version 2013 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 d8569d294aa..2ac8f1d7f4b 100644 --- a/Master/texmf-dist/web2c/texmf.cnf +++ b/Master/texmf-dist/web2c/texmf.cnf @@ -3,9 +3,9 @@ % % 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 of the full texmf.cnf! -- in ../../texmf.cnf. That is, if -% this file is installed in /some/path/to/texlive/2012/texmf/web2c/texmf.cnf, -% add your custom settings to /some/path/to/texlive/2012/texmf.cnf. +% entire copy! -- in ../../texmf.cnf. That is, if this file is +% installed in /some/path/to/texlive/2013/texmf-dist/web2c/texmf.cnf, +% add your custom settings to /some/path/to/texlive/2013/texmf.cnf. % % What follows is a super-summary of what this .cnf file can % contain. Please read the Kpathsea manual for more information. @@ -53,13 +53,13 @@ % SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent). TEXMFROOT = $SELFAUTOPARENT -% The tree containing runtime files related to the specific -% distribution and version. -TEXMFMAIN = $TEXMFROOT/texmf - -% The main tree of packages, distribution-agnostic: +% The main tree of distributed packages and programs: TEXMFDIST = $TEXMFROOT/texmf-dist +% We used to have a separate /texmf tree with some core programs and files. +% Keep the variable name. +TEXMFMAIN = $TEXMFDIST + % Local additions to the distribution trees. TEXMFLOCAL = $TEXMFROOT/../texmf-local @@ -76,25 +76,22 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config TEXMFHOME = ~/texmf % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data. -TEXMFVAR = ~/.texlive2012/texmf-var +TEXMFVAR = ~/.texlive2013/texmf-var % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. -TEXMFCONFIG = ~/.texlive2012/texmf-config +TEXMFCONFIG = ~/.texlive2013/texmf-config -% List all the texmf trees. +% List all the texmf trees. For an explanation of what they are, see the +% TeX Live manual. % % For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named % explicitly and before all other trees. % -% TEXMFLOCAL follows TEXMFMAIN (and precedes TEXMFDIST) because the -% files in TEXMFMAIN are tightly coupled with the particular version of -% the distribution, such as configuration files. Overriding them would -% be more likely to cause trouble than help. On the other hand, the -% bulk of packages and fonts are in TEXMFDIST, and locally-installed -% versions should take precedence over those -- although it is generally -% a source of confusion to have different versions of a package -% installed, whatever the trees, so try to avoid it. -TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST} +% TEXMFLOCAL precedes TEXMFDIST because locally-installed versions +% should take precedence over distribution files -- although it is +% generally a source of confusion to have different versions of a +% package installed, whatever the trees, so try to avoid it. +TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST} % Where to look for ls-R files. There need not be an ls-R in the % directories in this path, but if there is one, Kpathsea will use it. @@ -102,13 +99,13 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$T % does not create ls-R files in the non-!! elements -- because if an % ls-R is present, it will be used, and the disk will not be searched. % This is arguably a bug in kpathsea. -TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST} +TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST} % The system trees. These are the trees that are shared by all users. % If a tree appears in this list, the mktex* scripts will use % VARTEXFONTS for generated files, if the original tree isn't writable; % otherwise the current working directory is used. -SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFDIST +SYSTEXMF = $TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFDIST % Where generated fonts may be written. This tree is used when the sources % were found in a system tree and either that tree wasn't writable, or the @@ -429,7 +426,7 @@ DVIPDFMXINPUTS = $TEXMF/dvipdfmx % the /tex/ will not be found. % % So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex. -% The default LUAINPUTS sufficess for luatex and dviluatex. +% The default LUAINPUTS suffices for luatex and dviluatex. % LUAINPUTS.lualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// LUAINPUTS.dvilualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// @@ -457,7 +454,7 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % argv[0], in kpse_set_program_name. % % This main texmf.cnf file is installed, for a release YYYY, in a -% directory such as /usr/local/texlive/YYYY/texmf/web2c/texmf.cnf. +% directory such as /usr/local/texlive/YYYY/texmf-dist/web2c/texmf.cnf. % Since this file is subject to future updates, the TeX Live installer % or human administrator may also create a file % /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file @@ -467,7 +464,7 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % % The idea behind this lengthy definition: for each of % SELFAUTO{LOC,DIR,AUTO}, look in the directory, -% then the subdirectories share/texmf-local and share/texmf, +% then the subdirectories share/texmf-local and share/texmf-dist, % then ./texmf-local and ./texmf. % % However, we want to include one more directory: the @@ -483,15 +480,16 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % TEXMFCNF = {\ $SELFAUTOLOC,\ -$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf/web2c,\ -$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf/web2c,\ +$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf-dist/web2c,\ +$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf-dist/web2c,\ $SELFAUTODIR,\ -$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf/web2c,\ -$SELFAUTODIR/texmf-local/web2c,$SELFAUTODIR/texmf/web2c,\ +$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf-dist/web2c,\ +$SELFAUTODIR/texmf-local/web2c,$SELFAUTODIR/texmf-dist/web2c,\ $SELFAUTOPARENT/../texmf-local/web2c,\ $SELFAUTOPARENT,\ -$SELFAUTOPARENT/share/texmf-local/web2c,$SELFAUTOPARENT/share/texmf/web2c,\ -$SELFAUTOPARENT/texmf-local/web2c,$SELFAUTOPARENT/texmf/web2c\ +$SELFAUTOPARENT/share/texmf-local/web2c,\ +$SELFAUTOPARENT/share/texmf-dist/web2c,\ +$SELFAUTOPARENT/texmf-local/web2c,$SELFAUTOPARENT/texmf-dist/web2c\ } % % For reference, here is the old brace-using definition: @@ -568,7 +566,7 @@ shell_escape.initex = f % for the purportedly safe shell_escape_commands above to system % directories. TEXMF_RESTRICTED_SCRIPTS = \ - {!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}// + {!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}// % Allow TeX \openin, \openout, or \input on filenames starting with `.' % (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)? @@ -675,7 +673,7 @@ BIBTEX_CSFILE = 88591lat.csf % For some xy-pic samples, you may need as much as 700000 words of memory. % For the vast majority of documents, 60000 or less will do. % -main_memory = 3000000 % words of inimemory available; also applies to inimf&mp +main_memory = 5000000 % words of inimemory available; also applies to inimf&mp extra_mem_top = 0 % extra high memory for chars, tokens, etc. extra_mem_bot = 0 % extra low memory for boxes, glue, breakpoints, etc. @@ -685,17 +683,17 @@ extra_mem_bot.context = 4000000 % Words of font info for TeX (total size of all TFM files, approximately). % Must be >= 20000 and <= 147483647 (without tex.ch changes). -font_mem_size = 3000000 +font_mem_size = 8000000 % Total number of fonts. Must be >= 50 and <= 9000 (without tex.ch changes). font_max = 9000 % Extra space for the hash table of control sequences. -hash_extra = 200000 +hash_extra = 600000 % Max number of characters in all strings, including all error messages, % help texts, font names, control sequences. These values apply to TeX. -pool_size = 3250000 +pool_size = 6250000 % Minimum pool space after TeX's own strings; must be at least % 25000 less than pool_size, but doesn't need to be nearly that large. string_vacancies = 90000 @@ -723,7 +721,7 @@ nest_size = 500 % simultaneous semantic levels (e.g., groups) max_in_open = 15 % simultaneous input files and error insertions, % also applies to MetaPost param_size = 10000 % simultaneous macro parameters, also applies to MP -save_size = 50000 % for saving values outside current group +save_size = 100000 % for saving values outside current group stack_size = 5000 % simultaneous input sources % These are Omega-specific. diff --git a/Master/texmf-dist/web2c/texmfcnf.lua b/Master/texmf-dist/web2c/texmfcnf.lua index 039426e9440..6a68f04832d 100644 --- a/Master/texmf-dist/web2c/texmfcnf.lua +++ b/Master/texmf-dist/web2c/texmfcnf.lua @@ -37,7 +37,7 @@ return { -- TEXMFCNF = { -- "selfautoparent:/texmf-local", -- "selfautoparent:/texmf-local/web2c", - -- "selfautoparent:/texmf", + -- "selfautoparent:/texmf-dist", -- "selfautoparent:/texmf/web2c", -- "selfautoparent:", -- } @@ -45,13 +45,13 @@ return { -- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live TEXMFSYSVAR = "selfautoparent:texmf-var", - TEXMFVAR = "home:.texlive2012/texmf-var", + TEXMFVAR = "home:.texlive2013/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:.texlive2012/texmf-config", + TEXMFCONFIG = "home:.texlive2013/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 @@ -62,8 +62,8 @@ return { -- entry. This makes the tex root relocatable. TEXMFOS = "selfautodir:", - TEXMFMAIN = "selfautoparent:texmf", TEXMFDIST = "selfautoparent:texmf-dist", + TEXMFMAIN = TEXMFDIST, TEXMFLOCAL = texmflocal, TEXMFSYSCONFIG = "selfautoparent:texmf-config", @@ -76,7 +76,7 @@ return { -- We need texmfos for a few rare files but as I have a few more bin trees -- a hack is needed. Maybe other users also have texmf-platform-new trees. - TEXMF = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}", + TEXMF = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFDIST}", TEXFONTMAPS = ".;$TEXMF/fonts/data//;$TEXMF/fonts/map/{pdftex,dvips}//", ENCFONTS = ".;$TEXMF/fonts/data//;$TEXMF/fonts/enc/{dvips,pdftex}//", diff --git a/Master/tlpkg/TeXLive/TLConfFile.pm b/Master/tlpkg/TeXLive/TLConfFile.pm index 000d8e7aefb..6281044c4b9 100644 --- a/Master/tlpkg/TeXLive/TLConfFile.pm +++ b/Master/tlpkg/TeXLive/TLConfFile.pm @@ -670,7 +670,7 @@ Reparses the configuration file. For parsing a C<texmf.cnf> file you can use - $tmfcnf = TeXLive::TLConfFile->new(".../texmf/web2c", "[#%]", "="); + $tmfcnf = TeXLive::TLConfFile->new(".../texmf-dist/web2c", "[#%]", "="); since the allowed comment characters for texmf.cnf files are # and %. After that you can query keys: diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm index 4701bde8284..d6da6a76fa9 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, 2008, 2009, 2010, 2011, 2012 Norbert Preining +# Copyright 2007-2013 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. @@ -54,7 +54,7 @@ BEGIN { # the year of our release, will be used in the location of the # network packages, and in menu names, and other places. -$ReleaseYear = 2012; +$ReleaseYear = 2013; # 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. diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm index 4abb1561977..a7c613ddf88 100644 --- a/Master/tlpkg/TeXLive/TLPDB.pm +++ b/Master/tlpkg/TeXLive/TLPDB.pm @@ -279,7 +279,9 @@ sub from_file { if ($rootpath =~ m,file://*(.*)$,) { $rootpath = "/$1"; } - if (-d "$rootpath/texmf/web2c") { + if (-d "$rootpath/texmf-dist/web2c") { + $media = 'local_uncompressed'; + } elsif (-d "$rootpath/texmf/web2c") { # older $media = 'local_uncompressed'; } elsif (-d "$rootpath/$Archive") { $media = 'local_compressed'; diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm index e42f00c2020..3d8d695a82c 100644 --- a/Master/tlpkg/TeXLive/TLPOBJ.pm +++ b/Master/tlpkg/TeXLive/TLPOBJ.pm @@ -1355,12 +1355,12 @@ with C<|> characters inserted to show the indentation: |category TLCore |revision 4427 |docfiles size=959434 - | texmf/doc/dvips/dvips.html + | texmf-dist/doc/dvips/dvips.html | ... |runfiles size=1702468 - | texmf/dvips/base/color.pro + | texmf-dist/dvips/base/color.pro | ... - | texmf/scripts/pkfix/pkfix.pl + | texmf-dist/scripts/pkfix/pkfix.pl |binfiles arch=i386-solaris size=329700 | bin/i386-solaris/afm2tfm | bin/i386-solaris/dvips diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index d79522b9b17..8dcc0d603a5 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -1978,24 +1978,26 @@ sub add_remove_symlinks { return if win32(); if ($mode eq "add") { $errors++ unless add_link_dir_dir($plat_bindir, $sys_bin); - if (-d "$Master/texmf/doc/info") { - $errors++ unless add_link_dir_dir("$Master/texmf/doc/info", $sys_info); + if (-d "$Master/texmf-dist/doc/info") { + $errors++ + unless add_link_dir_dir("$Master/texmf-dist/doc/info", $sys_info); } } elsif ($mode eq "remove") { $errors++ unless remove_link_dir_dir($plat_bindir, $sys_bin); - if (-d "$Master/texmf/doc/info") { - $errors++ unless remove_link_dir_dir("$Master/texmf/doc/info", $sys_info); + if (-d "$Master/texmf-dist/doc/info") { + $errors++ + unless remove_link_dir_dir("$Master/texmf-dist/doc/info", $sys_info); } } else { die ("should not happen, unknown mode $mode in add_remove_symlinks!"); } mkdirhier $sys_man if ($mode eq "add"); - if (-w $sys_man && -d "$Master/texmf/doc/man") { + if (-w $sys_man && -d "$Master/texmf-dist/doc/man") { debug("$mode symlinks for man pages in $sys_man\n"); - my $foo = `(cd "$Master/texmf/doc/man" && echo *)`; + my $foo = `(cd "$Master/texmf-dist/doc/man" && echo *)`; chomp (my @mans = split (' ', $foo)); foreach my $m (@mans) { - my $mandir = "$Master/texmf/doc/man/$m"; + my $mandir = "$Master/texmf-dist/doc/man/$m"; next unless -d $mandir; if ($mode eq "add") { $errors++ unless add_link_dir_dir($mandir, "$sys_man/$m"); @@ -2689,7 +2691,7 @@ sub create_fmtutil { my ($tlpdb,$dest,$localconf) = @_; my @lines = $tlpdb->fmtutil_cnf_lines( get_disabled_local_configs($localconf, '#')); - _create_config_files($tlpdb, "texmf/web2c/fmtutil-hdr.cnf", $dest, + _create_config_files($tlpdb, "texmf-dist/web2c/fmtutil-hdr.cnf", $dest, $localconf, 0, '#', \@lines); } @@ -2697,7 +2699,7 @@ sub create_updmap { my ($tlpdb,$dest) = @_; check_for_old_updmap_cfg(); my @tlpdblines = $tlpdb->updmap_cfg_lines(); - _create_config_files($tlpdb, "texmf/web2c/updmap-hdr.cfg", $dest, + _create_config_files($tlpdb, "texmf-dist/web2c/updmap-hdr.cfg", $dest, undef, 0, '#', \@tlpdblines); } @@ -2787,8 +2789,8 @@ sub create_language_dat { # no checking for disabled stuff for language.dat and .def my @lines = $tlpdb->language_dat_lines( get_disabled_local_configs($localconf, '%')); - _create_config_files($tlpdb, "texmf/tex/generic/config/language.us", $dest, - $localconf, 0, '%', \@lines); + _create_config_files($tlpdb, "texmf-dist/tex/generic/config/language.us", + $dest, $localconf, 0, '%', \@lines); } sub create_language_def { @@ -2800,7 +2802,8 @@ sub create_language_def { push @postlines, "%%% No changes may be made beyond this point.\n"; push @postlines, "\n"; push @postlines, "\\uselanguage {USenglish} %%% This MUST be the last line of the file.\n"; - _create_config_files ($tlpdb, "texmf/tex/generic/config/language.us.def", $dest, $localconf, 1, '%', \@lines, @postlines); + _create_config_files ($tlpdb,"texmf-dist/tex/generic/config/language.us.def", + $dest, $localconf, 1, '%', \@lines, @postlines); } sub create_language_lua { @@ -2809,8 +2812,8 @@ sub create_language_lua { my @lines = $tlpdb->language_lua_lines( get_disabled_local_configs($localconf, '--')); my @postlines = ("}\n"); - _create_config_files ($tlpdb, "texmf/tex/generic/config/language.us.lua", - $dest, $localconf, 0, '--', \@lines, @postlines); + _create_config_files ($tlpdb,"texmf-dist/tex/generic/config/language.us.lua", + $dest, $localconf, 0, '--', \@lines, @postlines); } sub _create_config_files { diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet index 9ddbad1fe04..c63ebb347db 100755 --- a/Master/tlpkg/bin/tl-update-tlnet +++ b/Master/tlpkg/bin/tl-update-tlnet @@ -1,5 +1,5 @@ #!/bin/sh -e -# Copyright 2008, 2009, 2010, 2011, 2012 Norbert Preining +# Copyright 2008-2013 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=2012 +yyyy=2013 chicken=false critical= diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt index 310f974169c..1345ed9b57c 100644 --- a/Master/tlpkg/doc/releng.txt +++ b/Master/tlpkg/doc/releng.txt @@ -15,23 +15,23 @@ To stop updating of certain packages before the general freeze: tlpkg/dev/tlnet-disabled-packages.txt On the day of the last tlnet update, - set opt_frozen in 00texlive.installation.tlpsrc. + Set opt_frozen in 00texlive.installation.tlpsrc. Freeze should happen at that night's rebuild. -then, the next day, start building tlpretest: +Then, the next day, start building tlpretest: 0. Reset opt_frozen to 0 in 00texlive.installation.tlpsrc. 1a. Set up tlpretest: cd /home/ftp/texlive/tlnet -tar cf - [a-u]* | (cd ../tlpretest && tar xf -) -# do not copy README. -Update pretest.html, notably including major changes this year: +tar cf - [a-u]* | (cd ../tlpretest && tar xf -) # do not copy README +Update pretest.html, notably including major changes this year; diff new and old bindirs to see if there are interesting new programs. +Update /home/ftp/texlive/tlpretest/README. 1b. Preserve final tlnet of current release: -cp -ar tlnet /home/ftp/historic/systems/texlive/YYYY/tlnet-final +cp -ar ../tlnet /home/ftp/historic/systems/texlive/YYYY/tlnet-final 2. Then switch to pretest in cron.tl: critical=--critical # push tlcritical @@ -44,13 +44,13 @@ net_frozen=false # update tlnet|tlpretest (per $pretest) 3. The next nightly build will update tlpretest, or run force_rebuild=true cron.tl -4. Basic updates for release year (after freeze): +4. Basic updates for release year (to start pretest): +Master/.mkisofsrc +Master/release-texlive.txt Master/texmf-dist/web2c/texmf.cnf Master/texmf-dist/web2c/texmfcnf.lua -Master/release-texlive.txt Master/tlpkg/TeXLive/TLConfig.pm Master/tlpkg/bin/tl-update-tlnet -.mkisofsrc 5. When closer to release: in cron.tl, set images_frozen=false. @@ -63,7 +63,7 @@ Really test during pretest (really!): .fmt's sharable across endian-different platforms (including luatex). interactive mf '\drawdot (50,50); showit;' -When finalizing sources (can be before tlnet freeze) +When finalizing sources (can be even before tlnet freeze for pretest) version numbers and years and copyright years in: top level version.ac dvipdfmx: configure.ac ChangeLog @@ -79,7 +79,6 @@ After tlnet freeze: dviout texworks tlgs tlperl tlpsv When binary set and docs are stable enough: - Ask ConTeXt people to update if not done. peb + laurens + khaled: no commits. Compare Build/source/inst/texmf to texmf. tl-update-txi @@ -98,8 +97,8 @@ Making the big release: umount /home/ftp/texlive/Contents/live hx=/home/ftp/historic/systems/texlive -prev=2011 -this=2012 +prev=2012 +this=2013 mkdir $hx/$this cd /home/ftp/texlive/Images @@ -164,14 +163,12 @@ rm -rf branch # when starting a new year on tug mkdir branch; cd branch svn co file:///home/svn/texlive/branches/branch2012/Build/source . >&out - - update ~karl/bin/cron.tl, and reenable when feel ready. critical= pretest= net_frozen=false all_frozen=false - after release: texcollection/index.html store/index.html diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl index 7acef3af337..27f3cd03e5a 100644 --- a/Master/tlpkg/installer/install-menu-perltk.pl +++ b/Master/tlpkg/installer/install-menu-perltk.pl @@ -608,7 +608,7 @@ sub installation_window { $return = $MENU_ALREADYDONE; my $t = __("See %s/index.html for links to documentation.\nThe TeX Live web site (http://tug.org/texlive/) contains any updates and corrections. TeX Live is a joint project of the TeX user groups around the world; please consider supporting it by joining the group best for you. The list of groups is available on the web at http://tug.org/usergroups.html.", $::vars{'TEXDIR'}); if (!win32()) { - $t .= "\n\n" . __("Add %s/texmf/doc/man to MANPATH.\nAdd %s/texmf/doc/info to INFOPATH.\nMost importantly, add %s/bin/%s\nto your PATH for current and future sessions.", $::vars{'TEXDIR'}, $::vars{'TEXDIR'}, $::vars{'TEXDIR'}, $::vars{'this_platform'}); + $t .= "\n\n" . __("Add %s/texmf-dist/doc/man to MANPATH.\nAdd %s/texmf-dist/doc/info to INFOPATH.\nMost importantly, add %s/bin/%s\nto your PATH for current and future sessions.", $::vars{'TEXDIR'}, $::vars{'TEXDIR'}, $::vars{'TEXDIR'}, $::vars{'this_platform'}); } if (@::WARNLINES) { $t .= "\n\n" . __("There were some warnings during the installation process.\nHere is the list of warning messages:") . "\n"; diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl index d8772df2663..11808d9334e 100644 --- a/Master/tlpkg/installer/install-menu-wizard.pl +++ b/Master/tlpkg/installer/install-menu-wizard.pl @@ -739,7 +739,7 @@ sub wizard_installation_window { $return = $MENU_ALREADYDONE; my $t = __("See %s/index.html for links to documentation.\nThe TeX Live web site (http://tug.org/texlive/) contains any updates and corrections. TeX Live is a joint project of the TeX user groups around the world; please consider supporting it by joining the group best for you. The list of groups is available on the web at http://tug.org/usergroups.html.", $::vars{'TEXDIR'}); if (!win32()) { - $t .= "\n\n" . __("Add %s/texmf/doc/man to MANPATH.\nAdd %s/texmf/doc/info to INFOPATH.\nMost importantly, add %s/bin/%s\nto your PATH for current and future sessions.", $::vars{'TEXDIR'}, $::vars{'TEXDIR'}, $::vars{'TEXDIR'}, $::vars{'this_platform'}); + $t .= "\n\n" . __("Add %s/texmf-dist/doc/man to MANPATH.\nAdd %s/texmf-dist/doc/info to INFOPATH.\nMost importantly, add %s/bin/%s\nto your PATH for current and future sessions.", $::vars{'TEXDIR'}, $::vars{'TEXDIR'}, $::vars{'TEXDIR'}, $::vars{'this_platform'}); } if (@::WARNLINES) { $t .= "\n\n" . __("There were some warnings during the installation process.\nHere is the list of warning messages:") . "\n"; diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index fdbc43df1cb..d103a7d1113 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -2654,9 +2654,9 @@ sub exeext { sub preserve_man_pages { my ($pkg) = @_; - my $mandest = "$TOPDEST/texmf/doc/man/man1"; + my $mandest = "$TOPDEST/texmf-dist/doc/man/man1"; &xmkdir ($mandest); - &SYSTEM ("$CP $Master/texmf/doc/man/man1/$pkg.* $mandest/"); + &SYSTEM ("$CP $Master/texmf-dist/doc/man/man1/$pkg.* $mandest/"); } @@ -3093,7 +3093,7 @@ sub doscripts { } -# info files. We put these in texmf/doc/info, which is where we keep +# info files. We put these in texmf-dist/doc/info, which is where we keep # the info files for the programs, too. Having an info dir in # texmf-dist also would imply lots of changes in the installer, and # there seems to be no gain. @@ -3101,7 +3101,7 @@ sub doscripts { sub doinfos { my $infopatt = $specialinfos{$package}; return unless $infopatt; - &install ("$TOPDEST/texmf/doc/info/", $infopatt); + &install ("$TOPDEST/texmf-dist/doc/info/", $infopatt); } @@ -3125,16 +3125,16 @@ sub dotexinfos { # install() uses the @filenames global, ugh. local @filenames = <*.info>; - &install ("$TOPDEST/texmf/doc/info/", '.info'); + &install ("$TOPDEST/texmf-dist/doc/info/", '.info'); } -# man pages. We put these in texmf/doc/man/man1, a la info (see above). +# man pages. We put these in texmf-dist/doc/man/man1, a la info (see above). # sub domans { my $manpatt = $specialmans{$package}; return unless $manpatt; - &install ("$TOPDEST/texmf/doc/man/man1/", $manpatt); + &install ("$TOPDEST/texmf-dist/doc/man/man1/", $manpatt); &tl_man_to_pdf (); # make pdfs for them } @@ -3144,8 +3144,8 @@ sub domans { # remove them. # sub tl_man_to_pdf { - my $Master_man = "$Master/texmf/doc/man"; - my $pkg_man = "$TOPDEST/texmf/doc/man"; + my $Master_man = "$Master/texmf-dist/doc/man"; + my $pkg_man = "$TOPDEST/texmf-dist/doc/man"; print "tl_man_to_pdf for: " . join (" ", <$pkg_man/man1/*>) . "\n"; &SYSTEM ("cd $Master_man && $CP --parents Makefile man1/Makefile $pkg_man/"); @@ -3462,9 +3462,9 @@ sub MAKEnosymlinks { # # create: tlpkg/tlpsrc/hyphen-language.tlpsrc # (must be done by hand) -# create: texmf/tex/generic/config/language.ll.dat +# create: texmf-dist/tex/generic/config/language.ll.dat # (done here, unless it already exists) -# install pattern file from ctan: texmf/tex/generic/hyphen/langhyph.tex +# install pattern file from ctan: texmf-dist/tex/generic/hyphen/langhyph.tex # (done here) # add in: tlpkg/tlpsrc/collection-langwhatever.tlpsrc # (must be done by hand) @@ -3475,11 +3475,11 @@ sub GENMAKEhyphenation { &buildfilelist; &donormal; print "\t SPECIAL $package: install $hyphfile\n"; - my $generichyphdir = "$TOPDEST/texmf/tex/generic/hyphen"; + my $generichyphdir = "$TOPDEST/texmf-dist/tex/generic/hyphen"; &SYSTEM("mkdir -p $generichyphdir"); &SYSTEM("$MV $hyphfile $generichyphdir"); - my $genericconfigdir = "$TOPDEST/texmf/tex/generic/config"; + my $genericconfigdir = "$TOPDEST/texmf-dist/tex/generic/config"; my $configfile = "$genericconfigdir/language.$langabbrev.dat"; if (! -r $configfile) { print "\t SPECIAL $package: create $configfile\n"; @@ -4044,7 +4044,7 @@ sub MAKEelhyphen { &SYSTEM('for f in GR*hyph*.tex; do mv $f `echo $f | tr A-Z a-z`; done'); print "\t SPECIAL $package: install gr*hyph.tex files\n"; - my $generichyphdir = "$TOPDEST/texmf/tex/generic/hyphen"; + my $generichyphdir = "$TOPDEST/texmf-dist/tex/generic/hyphen"; &SYSTEM("mkdir -p $generichyphdir"); &SYSTEM("$MV gr*hyph*.tex $generichyphdir"); @@ -4234,7 +4234,7 @@ sub MAKEwadalab { foreach my $tarfile (@tarfiles) { &SYSTEM ("tar xzf $tarfile && rm $tarfile"); $tarfile =~ s/\.tar\.gz$//; - &SYSTEM ("cp -r $tarfile/texmf/* $DEST"); + &SYSTEM ("cp -r $tarfile/texmf-dist/* $DEST"); &SYSTEM ("rm -r $tarfile/texmf && rmdir $tarfile"); } # @@ -4953,7 +4953,7 @@ sub POSTcontext { print "still POST$package - man pages\n"; &xchdir ("$DEST/doc/$package/scripts"); - my $mandest = "$TOPDEST/texmf/doc/man/man1"; + my $mandest = "$TOPDEST/texmf-dist/doc/man/man1"; &xmkdir ($mandest); for my $exec (@exec) { # man pages might be under mkii or mkiv, just check both. @@ -5116,7 +5116,7 @@ sub POSTdehyph_exptl { sub POSTeplain { print "POST$package - eplain.info, man\n"; - my $infodir = "$TOPDEST/texmf/doc/info/"; + my $infodir = "$TOPDEST/texmf-dist/doc/info/"; &xmkdir ($infodir); &SYSTEM ("$MV doc/eplain/doc/eplain.info $infodir/"); @@ -5149,7 +5149,7 @@ sub POSTfontools { &SYSTEM ("chmod a+x $scriptdir/*"); &SYSTEM ("rmdir bin"); # - my $mandir = "$TOPDEST/texmf/doc/man/man1"; + my $mandir = "$TOPDEST/texmf-dist/doc/man/man1"; &xmkdir ($mandir); &SYSTEM ("$MV doc/*.1 $mandir/"); &SYSTEM ("rm -rf doc"); # skip pdfs, we'll make our own @@ -5410,7 +5410,7 @@ sub POST_do_man { } # print "POST$package - mv *.1 man pages from $src_mandir\n"; - my $mydest = "$TOPDEST/texmf/doc/man/man1/"; + my $mydest = "$TOPDEST/texmf-dist/doc/man/man1/"; &xmkdir ($mydest); &xchdir ($DEST); &SYSTEM ("$MV $src_mandir/*.1 $mydest"); diff --git a/Master/tlpkg/libexec/place b/Master/tlpkg/libexec/place index d6bd479fd36..49a17a69bd0 100755 --- a/Master/tlpkg/libexec/place +++ b/Master/tlpkg/libexec/place @@ -59,7 +59,7 @@ my $M = $DEST = getcwd (); # svn Master, ordinarily where we write # &xchdir (".."); -# top-level. for historical reasons, is usually just relative to +# top-level. For historical reasons, is usually just relative to # Master, e.g., has texmf-dist. But when a package has to write to both # Master and Build (e.g., biber), it will have Master and Build subdirs. my $TOP = getcwd (); @@ -74,8 +74,7 @@ if (-d "Master") { # maybe have both Build and Master my $cooked_master = getcwd (); if (-d "texmf-dist") { $Type = "Package"; } -elsif (-d "texmf") { $Type = "TLCore"; } -else { die "$cooked_master: no top level texmf or texmf-dist"; } +else { die "$cooked_master: no top level texmf-dist"; } die "top-level README under $TOP, that can't be right" if <*/README>; diff --git a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc index 1d867fcec68..796b657f34c 100644 --- a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc +++ b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc @@ -21,10 +21,10 @@ runpattern Package t texmf-dist scripts %NAME% runpattern Package t texmf-dist tex %NAME% srcpattern Package t texmf-dist source %NAME% docpattern Package t texmf-dist doc %NAME% -docpattern Package f texmf/doc/man/man1/%NAME%.* +docpattern Package f texmf-dist/doc/man/man1/%NAME%.* # auto patterns for category TLCore -docpattern TLCore t texmf doc %NAME% +docpattern TLCore t texmf-dist doc %NAME% # auto patterns for category ConTeXt, with special expansion type: # general form: %[str:]NAME[:str]% diff --git a/Master/tlpkg/tlpsrc/00texlive.image.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.image.tlpsrc index 7ff577efd8f..c128fab6cbe 100644 --- a/Master/tlpkg/tlpsrc/00texlive.image.tlpsrc +++ b/Master/tlpkg/tlpsrc/00texlive.image.tlpsrc @@ -19,10 +19,10 @@ runpattern d tlpkg/libexec runpattern f .mkisofsrc runpattern f autorun.inf # -runpattern f texmf/README -runpattern f texmf/doc/man/Makefile -runpattern f texmf/doc/man/man1/Makefile -runpattern f texmf/doc/man/man5/Makefile +runpattern f texmf-dist/README +runpattern f texmf-dist/doc/man/Makefile +runpattern f texmf-dist/doc/man/man1/Makefile +runpattern f texmf-dist/doc/man/man5/Makefile # runpattern f texmf-dist/README # diff --git a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc index f3dc0753cf6..3b89ba251bd 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 henceforth bail out saying that TLNNNN is frozen. -depend opt_frozen:1 +depend opt_frozen:0 diff --git a/Master/tlpkg/tlpsrc/a2ping.tlpsrc b/Master/tlpkg/tlpsrc/a2ping.tlpsrc index 0dfd146fb2c..b4dd18a6813 100644 --- a/Master/tlpkg/tlpsrc/a2ping.tlpsrc +++ b/Master/tlpkg/tlpsrc/a2ping.tlpsrc @@ -1,4 +1,4 @@ category TLCore -docpattern f texmf/doc/man/man1/${PKGNAME}.* +docpattern f texmf-dist/doc/man/man1/${PKGNAME}.* runpattern f texmf-dist/scripts/${PKGNAME}/${PKGNAME}.pl binpattern f bin/${ARCH}/${PKGNAME} diff --git a/Master/tlpkg/tlpsrc/afm2pl.tlpsrc b/Master/tlpkg/tlpsrc/afm2pl.tlpsrc index 21d6c3df7c9..d56fbe43101 100644 --- a/Master/tlpkg/tlpsrc/afm2pl.tlpsrc +++ b/Master/tlpkg/tlpsrc/afm2pl.tlpsrc @@ -1,6 +1,6 @@ category TLCore binpattern f bin/${ARCH}/${PKGNAME} -docpattern f texmf/doc/man/man1/${PKGNAME}.* -runpattern d texmf/fonts/enc/dvips/${PKGNAME} -runpattern d texmf/fonts/lig/${PKGNAME} -runpattern d texmf/tex/fontinst/${PKGNAME} +docpattern f texmf-dist/doc/man/man1/${PKGNAME}.* +runpattern d texmf-dist/fonts/enc/dvips/${PKGNAME} +runpattern d texmf-dist/fonts/lig/${PKGNAME} +runpattern d texmf-dist/tex/fontinst/${PKGNAME} diff --git a/Master/tlpkg/tlpsrc/aleph.tlpsrc b/Master/tlpkg/tlpsrc/aleph.tlpsrc index 7994a96868f..ea6c137ef3f 100644 --- a/Master/tlpkg/tlpsrc/aleph.tlpsrc +++ b/Master/tlpkg/tlpsrc/aleph.tlpsrc @@ -7,5 +7,5 @@ execute AddFormat name=lamed engine=aleph patterns=language.dat \ options=*lambda.ini binpattern f bin/${ARCH}/aleph binpattern f bin/${ARCH}/lamed -docpattern +f texmf/doc/man/man1/aleph.* -docpattern +f texmf/doc/man/man1/lamed.* +docpattern +f texmf-dist/doc/man/man1/aleph.* +docpattern +f texmf-dist/doc/man/man1/lamed.* diff --git a/Master/tlpkg/tlpsrc/amstex.tlpsrc b/Master/tlpkg/tlpsrc/amstex.tlpsrc index 2126e2a02f9..be90344d3a7 100644 --- a/Master/tlpkg/tlpsrc/amstex.tlpsrc +++ b/Master/tlpkg/tlpsrc/amstex.tlpsrc @@ -2,6 +2,6 @@ depend tex execute AddFormat name=amstex engine=pdftex \ options="-translate-file=cp227.tcx *amstex.ini" # -docpattern +f texmf/doc/man/man1/amstex.* +docpattern +f texmf-dist/doc/man/man1/amstex.* # binpattern f bin/${ARCH}/amstex diff --git a/Master/tlpkg/tlpsrc/asymptote.tlpsrc b/Master/tlpkg/tlpsrc/asymptote.tlpsrc index 10dad5f89ba..df649f2e969 100644 --- a/Master/tlpkg/tlpsrc/asymptote.tlpsrc +++ b/Master/tlpkg/tlpsrc/asymptote.tlpsrc @@ -7,10 +7,10 @@ sparc-solaris\ # binpattern d/win32 tlpkg/${PKGNAME} # -docpattern f texmf/doc/info/asy*.info -docpattern f texmf/doc/man/man1/*asy.* -docpattern d texmf/doc/${PKGNAME} +docpattern f texmf-dist/doc/info/asy*.info +docpattern f texmf-dist/doc/man/man1/*asy.* +docpattern d texmf-dist/doc/${PKGNAME} # -runpattern d texmf/${PKGNAME} -runpattern d texmf/tex/latex/${PKGNAME} -runpattern d texmf/tex/context/${PKGNAME} +runpattern d texmf-dist/${PKGNAME} +runpattern d texmf-dist/tex/latex/${PKGNAME} +runpattern d texmf-dist/tex/context/${PKGNAME} diff --git a/Master/tlpkg/tlpsrc/bibtex.tlpsrc b/Master/tlpkg/tlpsrc/bibtex.tlpsrc index 5619821a49e..f612ccb9013 100644 --- a/Master/tlpkg/tlpsrc/bibtex.tlpsrc +++ b/Master/tlpkg/tlpsrc/bibtex.tlpsrc @@ -4,5 +4,5 @@ runpattern d texmf-dist/bibtex/bib/base runpattern d texmf-dist/bibtex/bst/base docpattern d texmf-dist/doc/bibtex/base docpattern d texmf-dist/tex/generic/bibtex -docpattern f texmf/doc/man/man1/bibtex.* +docpattern f texmf-dist/doc/man/man1/bibtex.* binpattern f bin/${ARCH}/bibtex diff --git a/Master/tlpkg/tlpsrc/bibtex8.tlpsrc b/Master/tlpkg/tlpsrc/bibtex8.tlpsrc index 5613d603457..59f9f7730f4 100644 --- a/Master/tlpkg/tlpsrc/bibtex8.tlpsrc +++ b/Master/tlpkg/tlpsrc/bibtex8.tlpsrc @@ -2,5 +2,5 @@ category TLCore runpattern d texmf-dist/bibtex/csf/base # this should be its own package, but didn't seem worth it. --karl, 9sep08 runpattern d texmf-dist/bibtex/csf/polish-csf -docpattern f texmf/doc/bibtex8/* +docpattern f texmf-dist/doc/bibtex8/* binpattern f bin/${ARCH}/bibtex8 diff --git a/Master/tlpkg/tlpsrc/bundledoc.tlpsrc b/Master/tlpkg/tlpsrc/bundledoc.tlpsrc index 06997a74498..8f421c41b7e 100644 --- a/Master/tlpkg/tlpsrc/bundledoc.tlpsrc +++ b/Master/tlpkg/tlpsrc/bundledoc.tlpsrc @@ -1,3 +1,3 @@ -docpattern +f texmf/doc/man/man1/arlatex.* +docpattern +f texmf-dist/doc/man/man1/arlatex.* binpattern f bin/${ARCH}/arlatex binpattern f bin/${ARCH}/${PKGNAME} diff --git a/Master/tlpkg/tlpsrc/chktex.tlpsrc b/Master/tlpkg/tlpsrc/chktex.tlpsrc index df82172bf37..6323f9db8a7 100644 --- a/Master/tlpkg/tlpsrc/chktex.tlpsrc +++ b/Master/tlpkg/tlpsrc/chktex.tlpsrc @@ -3,10 +3,10 @@ binpattern f bin/${ARCH}/${PKGNAME} binpattern f bin/${ARCH}/chkweb binpattern f bin/${ARCH}/deweb # -runpattern d texmf/${PKGNAME} -runpattern d texmf/scripts/${PKGNAME} +runpattern d texmf-dist/${PKGNAME} +runpattern d texmf-dist/scripts/${PKGNAME} # -docpattern d texmf/doc/${PKGNAME} -docpattern f texmf/doc/man/man1/${PKGNAME}.* -docpattern f texmf/doc/man/man1/chkweb.* -docpattern f texmf/doc/man/man1/deweb.* +docpattern d texmf-dist/doc/${PKGNAME} +docpattern f texmf-dist/doc/man/man1/${PKGNAME}.* +docpattern f texmf-dist/doc/man/man1/chkweb.* +docpattern f texmf-dist/doc/man/man1/deweb.* diff --git a/Master/tlpkg/tlpsrc/cjkutils.tlpsrc b/Master/tlpkg/tlpsrc/cjkutils.tlpsrc index 2a83193dffb..17e81153f2b 100644 --- a/Master/tlpkg/tlpsrc/cjkutils.tlpsrc +++ b/Master/tlpkg/tlpsrc/cjkutils.tlpsrc @@ -1,19 +1,19 @@ category TLCore -runpattern d texmf/hbf2gf -docpattern d texmf/doc/bg5conv -docpattern d texmf/doc/cef5conv -docpattern d texmf/doc/cefconv -docpattern d texmf/doc/cefsconv -docpattern d texmf/doc/extconv -docpattern d texmf/doc/hbf2gf -docpattern d texmf/doc/sjisconv -docpattern f texmf/doc/man/man1/bg5conv.* -docpattern f texmf/doc/man/man1/cef5conv.* -docpattern f texmf/doc/man/man1/cefconv.* -docpattern f texmf/doc/man/man1/cefsconv.* -docpattern f texmf/doc/man/man1/extconv.* -docpattern f texmf/doc/man/man1/hbf2gf.* -docpattern f texmf/doc/man/man1/sjisconv.* +runpattern d texmf-dist/hbf2gf +docpattern d texmf-dist/doc/bg5conv +docpattern d texmf-dist/doc/cef5conv +docpattern d texmf-dist/doc/cefconv +docpattern d texmf-dist/doc/cefsconv +docpattern d texmf-dist/doc/extconv +docpattern d texmf-dist/doc/hbf2gf +docpattern d texmf-dist/doc/sjisconv +docpattern f texmf-dist/doc/man/man1/bg5conv.* +docpattern f texmf-dist/doc/man/man1/cef5conv.* +docpattern f texmf-dist/doc/man/man1/cefconv.* +docpattern f texmf-dist/doc/man/man1/cefsconv.* +docpattern f texmf-dist/doc/man/man1/extconv.* +docpattern f texmf-dist/doc/man/man1/hbf2gf.* +docpattern f texmf-dist/doc/man/man1/sjisconv.* binpattern f bin/${ARCH}/bg5+latex binpattern f bin/${ARCH}/bg5+pdflatex binpattern f bin/${ARCH}/bg5conv diff --git a/Master/tlpkg/tlpsrc/context.tlpsrc b/Master/tlpkg/tlpsrc/context.tlpsrc index de6903bedd5..f913f88705a 100644 --- a/Master/tlpkg/tlpsrc/context.tlpsrc +++ b/Master/tlpkg/tlpsrc/context.tlpsrc @@ -57,10 +57,10 @@ srcpattern +!d texmf-dist/source/context/third # docpattern +!d texmf-dist/doc/context/third docpattern +!d texmf-dist/doc/generic/tex-virtual-academy-pl/context -docpattern +f texmf/doc/man/man1/ctxtools.* -docpattern +f texmf/doc/man/man1/pstopdf.* -docpattern +f texmf/doc/man/man1/texexec.* -docpattern +f texmf/doc/man/man1/texmfstart.* +docpattern +f texmf-dist/doc/man/man1/ctxtools.* +docpattern +f texmf-dist/doc/man/man1/pstopdf.* +docpattern +f texmf-dist/doc/man/man1/texexec.* +docpattern +f texmf-dist/doc/man/man1/texmfstart.* # binpattern f bin/${ARCH}/context binpattern f bin/${ARCH}/ctxtools diff --git a/Master/tlpkg/tlpsrc/ctanify.tlpsrc b/Master/tlpkg/tlpsrc/ctanify.tlpsrc index b086c0c650a..745e64e018f 100644 --- a/Master/tlpkg/tlpsrc/ctanify.tlpsrc +++ b/Master/tlpkg/tlpsrc/ctanify.tlpsrc @@ -1,2 +1,2 @@ binpattern f bin/${ARCH}/${PKGNAME} -docpattern +f texmf/doc/man/man1/${PKGNAME}.* +docpattern +f texmf-dist/doc/man/man1/${PKGNAME}.* diff --git a/Master/tlpkg/tlpsrc/ctie.tlpsrc b/Master/tlpkg/tlpsrc/ctie.tlpsrc index 29f9da3b00a..3d87f0a97cf 100644 --- a/Master/tlpkg/tlpsrc/ctie.tlpsrc +++ b/Master/tlpkg/tlpsrc/ctie.tlpsrc @@ -1,4 +1,4 @@ category TLCore depend kpathsea -docpattern f texmf/doc/man/man1/ctie.* +docpattern f texmf-dist/doc/man/man1/ctie.* binpattern f bin/${ARCH}/ctie diff --git a/Master/tlpkg/tlpsrc/cweb.tlpsrc b/Master/tlpkg/tlpsrc/cweb.tlpsrc index 90b84158f12..f201523cf2e 100644 --- a/Master/tlpkg/tlpsrc/cweb.tlpsrc +++ b/Master/tlpkg/tlpsrc/cweb.tlpsrc @@ -1,5 +1,5 @@ -docpattern +f texmf/doc/man/man1/ctangle.* -docpattern +f texmf/doc/man/man1/cweave.* -docpattern +f texmf/doc/man/man1/cweb.* +docpattern +f texmf-dist/doc/man/man1/ctangle.* +docpattern +f texmf-dist/doc/man/man1/cweave.* +docpattern +f texmf-dist/doc/man/man1/cweb.* binpattern f bin/${ARCH}/ctangle binpattern f bin/${ARCH}/cweave diff --git a/Master/tlpkg/tlpsrc/cyrillic-bin.tlpsrc b/Master/tlpkg/tlpsrc/cyrillic-bin.tlpsrc index e9fb2caacb0..95ed8a48085 100644 --- a/Master/tlpkg/tlpsrc/cyrillic-bin.tlpsrc +++ b/Master/tlpkg/tlpsrc/cyrillic-bin.tlpsrc @@ -6,5 +6,5 @@ runpattern f texmf-dist/scripts/tetex/rumakeindex.sh binpattern f bin/${ARCH}/rubibtex binpattern f bin/${ARCH}/rumakeindex # -docpattern f texmf/doc/man/man1/rubibtex.* -docpattern f texmf/doc/man/man1/rumakeindex.* +docpattern f texmf-dist/doc/man/man1/rubibtex.* +docpattern f texmf-dist/doc/man/man1/rumakeindex.* diff --git a/Master/tlpkg/tlpsrc/detex.tlpsrc b/Master/tlpkg/tlpsrc/detex.tlpsrc index 6ca419849b8..b7d0770f155 100644 --- a/Master/tlpkg/tlpsrc/detex.tlpsrc +++ b/Master/tlpkg/tlpsrc/detex.tlpsrc @@ -1,3 +1,3 @@ category TLCore binpattern f bin/${ARCH}/detex -docpattern f texmf/doc/man/man1/${PKGNAME}.* +docpattern f texmf-dist/doc/man/man1/${PKGNAME}.* diff --git a/Master/tlpkg/tlpsrc/dosepsbin.tlpsrc b/Master/tlpkg/tlpsrc/dosepsbin.tlpsrc index b5919e3d25d..1b28fdd1d42 100644 --- a/Master/tlpkg/tlpsrc/dosepsbin.tlpsrc +++ b/Master/tlpkg/tlpsrc/dosepsbin.tlpsrc @@ -1,4 +1,4 @@ binpattern f bin/${ARCH}/${PKGNAME} docpattern d texmf-dist/doc/support/${PKGNAME} -docpattern f texmf/doc/man/man1/${PKGNAME}.* +docpattern f texmf-dist/doc/man/man1/${PKGNAME}.* runpattern d texmf-dist/scripts/${PKGNAME} diff --git a/Master/tlpkg/tlpsrc/dtl.tlpsrc b/Master/tlpkg/tlpsrc/dtl.tlpsrc index 62f19e8e812..203c8e9fe34 100644 --- a/Master/tlpkg/tlpsrc/dtl.tlpsrc +++ b/Master/tlpkg/tlpsrc/dtl.tlpsrc @@ -1,5 +1,5 @@ category TLCore -runpattern f texmf/doc/man/man1/dt2dv.* -runpattern f texmf/doc/man/man1/dv2dt.* +runpattern f texmf-dist/doc/man/man1/dt2dv.* +runpattern f texmf-dist/doc/man/man1/dv2dt.* binpattern f bin/${ARCH}/dt2dv binpattern f bin/${ARCH}/dv2dt diff --git a/Master/tlpkg/tlpsrc/dvi2tty.tlpsrc b/Master/tlpkg/tlpsrc/dvi2tty.tlpsrc index 1076bee70f7..08334265f89 100644 --- a/Master/tlpkg/tlpsrc/dvi2tty.tlpsrc +++ b/Master/tlpkg/tlpsrc/dvi2tty.tlpsrc @@ -1,5 +1,5 @@ category TLCore -runpattern f texmf/doc/man/man1/dvi2tty.* +runpattern f texmf-dist/doc/man/man1/dvi2tty.* binpattern f bin/${ARCH}/disdvi binpattern f bin/${ARCH}/dvi2tty -docpattern f texmf/doc/man/man1/disdvi.* +docpattern f texmf-dist/doc/man/man1/disdvi.* diff --git a/Master/tlpkg/tlpsrc/dvicopy.tlpsrc b/Master/tlpkg/tlpsrc/dvicopy.tlpsrc index f32ab01f734..c0c53f3a34a 100644 --- a/Master/tlpkg/tlpsrc/dvicopy.tlpsrc +++ b/Master/tlpkg/tlpsrc/dvicopy.tlpsrc @@ -1,3 +1,3 @@ category TLCore -docpattern f texmf/doc/man/man1/dvicopy.* +docpattern f texmf-dist/doc/man/man1/dvicopy.* binpattern f bin/${ARCH}/dvicopy diff --git a/Master/tlpkg/tlpsrc/dvidvi.tlpsrc b/Master/tlpkg/tlpsrc/dvidvi.tlpsrc index 8b18c877eda..c4619d04282 100644 --- a/Master/tlpkg/tlpsrc/dvidvi.tlpsrc +++ b/Master/tlpkg/tlpsrc/dvidvi.tlpsrc @@ -1,5 +1,5 @@ category TLCore -runpattern f texmf/doc/man/man1/dvidvi.* +runpattern f texmf-dist/doc/man/man1/dvidvi.* binpattern f bin/${ARCH}/dvidvi binpattern f/win32 bin/win32/a5bookle binpattern f/win32 bin/win32/doubside diff --git a/Master/tlpkg/tlpsrc/dviljk.tlpsrc b/Master/tlpkg/tlpsrc/dviljk.tlpsrc index ab774972d40..35c567c77cc 100644 --- a/Master/tlpkg/tlpsrc/dviljk.tlpsrc +++ b/Master/tlpkg/tlpsrc/dviljk.tlpsrc @@ -1,10 +1,10 @@ category TLCore -docpattern f texmf/doc/man/man1/dvihp.* -docpattern f texmf/doc/man/man1/dvilj.* -docpattern f texmf/doc/man/man1/dvilj2p.* -docpattern f texmf/doc/man/man1/dvilj4.* -docpattern f texmf/doc/man/man1/dvilj4l.* -docpattern f texmf/doc/man/man1/dvilj6.* +docpattern f texmf-dist/doc/man/man1/dvihp.* +docpattern f texmf-dist/doc/man/man1/dvilj.* +docpattern f texmf-dist/doc/man/man1/dvilj2p.* +docpattern f texmf-dist/doc/man/man1/dvilj4.* +docpattern f texmf-dist/doc/man/man1/dvilj4l.* +docpattern f texmf-dist/doc/man/man1/dvilj6.* binpattern f bin/${ARCH}/dvihp binpattern f bin/${ARCH}/dvilj binpattern f bin/${ARCH}/dvilj2p diff --git a/Master/tlpkg/tlpsrc/dvipdfm.tlpsrc b/Master/tlpkg/tlpsrc/dvipdfm.tlpsrc index 3503aead5de..9bc676bf332 100644 --- a/Master/tlpkg/tlpsrc/dvipdfm.tlpsrc +++ b/Master/tlpkg/tlpsrc/dvipdfm.tlpsrc @@ -1,11 +1,11 @@ category TLCore -runpattern d texmf/dvipdfm -runpattern f texmf/tex/latex/dvipdfm/* +runpattern d texmf-dist/dvipdfm +runpattern f texmf-dist/tex/latex/dvipdfm/* # -docpattern f texmf/doc/dvipdfm/* -docpattern f texmf/doc/man/man1/dvipdfm.* -docpattern f texmf/doc/man/man1/dvipdft.* -docpattern f texmf/doc/man/man1/ebb.* +docpattern f texmf-dist/doc/dvipdfm/* +docpattern f texmf-dist/doc/man/man1/dvipdfm.* +docpattern f texmf-dist/doc/man/man1/dvipdft.* +docpattern f texmf-dist/doc/man/man1/ebb.* # binpattern f bin/${ARCH}/dvipdfm binpattern f bin/${ARCH}/dvipdft diff --git a/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc b/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc index 2ce44cba5cd..6fe26c59eb6 100644 --- a/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc +++ b/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc @@ -5,13 +5,13 @@ depend dvipdfmx-def postaction script file=tlpkg/tlpostcode/dvipdfmx.pl # runpattern f tlpkg/tlpostcode/dvipdfmx.pl -runpattern d texmf/dvipdfmx -runpattern d texmf/fonts/cmap -runpattern d texmf/fonts/map/dvipdfmx +runpattern d texmf-dist/dvipdfmx +runpattern d texmf-dist/fonts/cmap +runpattern d texmf-dist/fonts/map/dvipdfmx # binpattern f bin/${ARCH}/dvipdfmx binpattern f bin/${ARCH}/ebb binpattern f bin/${ARCH}/extractbb # -docpattern f texmf/doc/man/man1/extractbb* -docpattern d texmf/doc/dvipdfmx +docpattern f texmf-dist/doc/man/man1/extractbb* +docpattern d texmf-dist/doc/dvipdfmx diff --git a/Master/tlpkg/tlpsrc/dvipng.tlpsrc b/Master/tlpkg/tlpsrc/dvipng.tlpsrc index c294955e6e6..1283d112b4d 100644 --- a/Master/tlpkg/tlpsrc/dvipng.tlpsrc +++ b/Master/tlpkg/tlpsrc/dvipng.tlpsrc @@ -1,7 +1,7 @@ category TLCore -docpattern f texmf/doc/dvipng/* -docpattern f texmf/doc/info/dvipng.info -docpattern f texmf/doc/man/man1/dvipng.* -docpattern f texmf/doc/man/man1/dvigif.* +docpattern f texmf-dist/doc/dvipng/* +docpattern f texmf-dist/doc/info/dvipng.info +docpattern f texmf-dist/doc/man/man1/dvipng.* +docpattern f texmf-dist/doc/man/man1/dvigif.* binpattern f bin/${ARCH}/dvigif binpattern f bin/${ARCH}/dvipng diff --git a/Master/tlpkg/tlpsrc/dvipos.tlpsrc b/Master/tlpkg/tlpsrc/dvipos.tlpsrc index 4a697ef4506..dc35b9cded4 100644 --- a/Master/tlpkg/tlpsrc/dvipos.tlpsrc +++ b/Master/tlpkg/tlpsrc/dvipos.tlpsrc @@ -1,3 +1,3 @@ category TLCore -docpattern f texmf/doc/man/man1/dvipos.* +docpattern f texmf-dist/doc/man/man1/dvipos.* binpattern f bin/${ARCH}/dvipos diff --git a/Master/tlpkg/tlpsrc/dvips.tlpsrc b/Master/tlpkg/tlpsrc/dvips.tlpsrc index 2084be0fde3..fe40e699733 100644 --- a/Master/tlpkg/tlpsrc/dvips.tlpsrc +++ b/Master/tlpkg/tlpsrc/dvips.tlpsrc @@ -2,12 +2,12 @@ srcpattern f ignore runpattern d texmf-dist/dvips/base runpattern d texmf-dist/fonts/enc/dvips/base runpattern d texmf-dist/tex/generic/dvips -runpattern f texmf/dvips/base/* -runpattern f texmf/dvips/config/* -runpattern f texmf/fonts/map/dvips/updmap/* -docpattern f texmf/doc/dvips/* -docpattern f texmf/doc/info/dvips* -docpattern f texmf/doc/man/man1/afm2tfm.* -docpattern f texmf/doc/man/man1/dvips.* +runpattern f texmf-dist/dvips/base/* +runpattern f texmf-dist/dvips/config/* +runpattern f texmf-dist/fonts/map/dvips/updmap/* +docpattern f texmf-dist/doc/dvips/* +docpattern f texmf-dist/doc/info/dvips* +docpattern f texmf-dist/doc/man/man1/afm2tfm.* +docpattern f texmf-dist/doc/man/man1/dvips.* binpattern f bin/${ARCH}/afm2tfm binpattern f bin/${ARCH}/dvips diff --git a/Master/tlpkg/tlpsrc/dvisvgm.tlpsrc b/Master/tlpkg/tlpsrc/dvisvgm.tlpsrc index 7eaa3dd8762..3ffbf1aded8 100644 --- a/Master/tlpkg/tlpsrc/dvisvgm.tlpsrc +++ b/Master/tlpkg/tlpsrc/dvisvgm.tlpsrc @@ -1,3 +1,3 @@ category TLCore binpattern f bin/${ARCH}/dvisvgm -docpattern f texmf/doc/man/man1/dvisvgm.* +docpattern f texmf-dist/doc/man/man1/dvisvgm.* diff --git a/Master/tlpkg/tlpsrc/eplain.tlpsrc b/Master/tlpkg/tlpsrc/eplain.tlpsrc index df91d45923c..a612de62e19 100644 --- a/Master/tlpkg/tlpsrc/eplain.tlpsrc +++ b/Master/tlpkg/tlpsrc/eplain.tlpsrc @@ -1,6 +1,6 @@ depend pdftex execute AddFormat name=eplain engine=pdftex patterns=language.dat \ options="-translate-file=cp227.tcx *eplain.ini" -docpattern +f texmf/doc/info/eplain.info -docpattern +f texmf/doc/man/man1/eplain.* +docpattern +f texmf-dist/doc/info/eplain.info +docpattern +f texmf-dist/doc/man/man1/eplain.* binpattern f bin/${ARCH}/eplain diff --git a/Master/tlpkg/tlpsrc/epspdf.tlpsrc b/Master/tlpkg/tlpsrc/epspdf.tlpsrc index 8ccb5aaf88b..78a3f703509 100644 --- a/Master/tlpkg/tlpsrc/epspdf.tlpsrc +++ b/Master/tlpkg/tlpsrc/epspdf.tlpsrc @@ -1,4 +1,4 @@ -docpattern f texmf/doc/info/epspdf.info +docpattern f texmf-dist/doc/info/epspdf.info docpattern d texmf-dist/doc/support/epspdf runpattern d texmf-dist/scripts/epspdf binpattern f bin/${ARCH}/epspdf diff --git a/Master/tlpkg/tlpsrc/epstopdf.tlpsrc b/Master/tlpkg/tlpsrc/epstopdf.tlpsrc index 72ebf34657d..197dd080013 100644 --- a/Master/tlpkg/tlpsrc/epstopdf.tlpsrc +++ b/Master/tlpkg/tlpsrc/epstopdf.tlpsrc @@ -1,4 +1,4 @@ binpattern f bin/${ARCH}/${PKGNAME} binpattern f bin/${ARCH}/repstopdf -docpattern +f texmf/doc/man/man1/${PKGNAME}.* -docpattern +f texmf/doc/man/man1/repstopdf.* +docpattern +f texmf-dist/doc/man/man1/${PKGNAME}.* +docpattern +f texmf-dist/doc/man/man1/repstopdf.* diff --git a/Master/tlpkg/tlpsrc/findhyph.tlpsrc b/Master/tlpkg/tlpsrc/findhyph.tlpsrc index b086c0c650a..745e64e018f 100644 --- a/Master/tlpkg/tlpsrc/findhyph.tlpsrc +++ b/Master/tlpkg/tlpsrc/findhyph.tlpsrc @@ -1,2 +1,2 @@ binpattern f bin/${ARCH}/${PKGNAME} -docpattern +f texmf/doc/man/man1/${PKGNAME}.* +docpattern +f texmf-dist/doc/man/man1/${PKGNAME}.* diff --git a/Master/tlpkg/tlpsrc/fontname.tlpsrc b/Master/tlpkg/tlpsrc/fontname.tlpsrc index 60c86e9a038..2ba0cf01339 100644 --- a/Master/tlpkg/tlpsrc/fontname.tlpsrc +++ b/Master/tlpkg/tlpsrc/fontname.tlpsrc @@ -1 +1 @@ -docpattern +f texmf/doc/info/fontname.info +docpattern +f texmf-dist/doc/info/fontname.info diff --git a/Master/tlpkg/tlpsrc/fontools.tlpsrc b/Master/tlpkg/tlpsrc/fontools.tlpsrc index 4edd4cf77d9..78da036859d 100644 --- a/Master/tlpkg/tlpsrc/fontools.tlpsrc +++ b/Master/tlpkg/tlpsrc/fontools.tlpsrc @@ -1,6 +1,6 @@ binpattern f bin/${ARCH}/afm2afm binpattern f bin/${ARCH}/autoinst binpattern f bin/${ARCH}/ot2kpx -docpattern +f texmf/doc/man/man1/afm2afm.* -docpattern +f texmf/doc/man/man1/autoinst.* -docpattern +f texmf/doc/man/man1/ot2kpx.* +docpattern +f texmf-dist/doc/man/man1/afm2afm.* +docpattern +f texmf-dist/doc/man/man1/autoinst.* +docpattern +f texmf-dist/doc/man/man1/ot2kpx.* diff --git a/Master/tlpkg/tlpsrc/fontware.tlpsrc b/Master/tlpkg/tlpsrc/fontware.tlpsrc index 0d1ec3d014c..2b710917e71 100644 --- a/Master/tlpkg/tlpsrc/fontware.tlpsrc +++ b/Master/tlpkg/tlpsrc/fontware.tlpsrc @@ -1,8 +1,8 @@ category TLCore -docpattern f texmf/doc/man/man1/pltotf.* -docpattern f texmf/doc/man/man1/tftopl.* -docpattern f texmf/doc/man/man1/vftovp.* -docpattern f texmf/doc/man/man1/vptovf.* +docpattern f texmf-dist/doc/man/man1/pltotf.* +docpattern f texmf-dist/doc/man/man1/tftopl.* +docpattern f texmf-dist/doc/man/man1/vftovp.* +docpattern f texmf-dist/doc/man/man1/vptovf.* binpattern f bin/${ARCH}/pltotf binpattern f bin/${ARCH}/tftopl binpattern f bin/${ARCH}/vftovp diff --git a/Master/tlpkg/tlpsrc/gsftopk.tlpsrc b/Master/tlpkg/tlpsrc/gsftopk.tlpsrc index 3a460f0a713..002fa5ff09d 100644 --- a/Master/tlpkg/tlpsrc/gsftopk.tlpsrc +++ b/Master/tlpkg/tlpsrc/gsftopk.tlpsrc @@ -1,4 +1,4 @@ category TLCore -runpattern f texmf/dvips/gsftopk/* -docpattern f texmf/doc/man/man1/gsftopk.* +runpattern f texmf-dist/dvips/gsftopk/* +docpattern f texmf-dist/doc/man/man1/gsftopk.* binpattern f bin/${ARCH}/gsftopk diff --git a/Master/tlpkg/tlpsrc/hyphen-ancientgreek.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-ancientgreek.tlpsrc index 14082eca56c..f5ac752f3a4 100644 --- a/Master/tlpkg/tlpsrc/hyphen-ancientgreek.tlpsrc +++ b/Master/tlpkg/tlpsrc/hyphen-ancientgreek.tlpsrc @@ -20,5 +20,5 @@ execute AddHyphen \ file=ibyhyph.tex \ luaspecial="disabled:8-bit only" -runpattern f texmf/tex/generic/hyphen/grahyph5.tex -runpattern f texmf/tex/generic/hyphen/ibyhyph.tex +runpattern f texmf-dist/tex/generic/hyphen/grahyph5.tex +runpattern f texmf-dist/tex/generic/hyphen/ibyhyph.tex diff --git a/Master/tlpkg/tlpsrc/hyphen-base.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-base.tlpsrc index 13a5a6cd144..984e12679fa 100644 --- a/Master/tlpkg/tlpsrc/hyphen-base.tlpsrc +++ b/Master/tlpkg/tlpsrc/hyphen-base.tlpsrc @@ -1,11 +1,11 @@ category TLCore -runpattern f texmf/tex/generic/config/language.dat -runpattern f texmf/tex/generic/config/language.dat.lua -runpattern f texmf/tex/generic/config/language.def -runpattern f texmf/tex/generic/config/language.us -runpattern f texmf/tex/generic/config/language.us.def -runpattern f texmf/tex/generic/config/language.us.lua -runpattern f texmf/tex/generic/hyphen/dumyhyph.tex -runpattern f texmf/tex/generic/hyphen/hyphen.tex -runpattern f texmf/tex/generic/hyphen/hypht1.tex -runpattern f texmf/tex/generic/hyphen/zerohyph.tex +runpattern f texmf-dist/tex/generic/config/language.dat +runpattern f texmf-dist/tex/generic/config/language.dat.lua +runpattern f texmf-dist/tex/generic/config/language.def +runpattern f texmf-dist/tex/generic/config/language.us +runpattern f texmf-dist/tex/generic/config/language.us.def +runpattern f texmf-dist/tex/generic/config/language.us.lua +runpattern f texmf-dist/tex/generic/hyphen/dumyhyph.tex +runpattern f texmf-dist/tex/generic/hyphen/hyphen.tex +runpattern f texmf-dist/tex/generic/hyphen/hypht1.tex +runpattern f texmf-dist/tex/generic/hyphen/zerohyph.tex diff --git a/Master/tlpkg/tlpsrc/hyphen-german.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-german.tlpsrc index e0b4a306baf..a90eefb438c 100644 --- a/Master/tlpkg/tlpsrc/hyphen-german.tlpsrc +++ b/Master/tlpkg/tlpsrc/hyphen-german.tlpsrc @@ -34,8 +34,8 @@ execute AddHyphen \ file_patterns=hyph-de-ch-1901.pat.txt \ file_exceptions= -runpattern f texmf/tex/generic/hyphen/dehypht.tex -runpattern f texmf/tex/generic/hyphen/dehyphn.tex +runpattern f texmf-dist/tex/generic/hyphen/dehypht.tex +runpattern f texmf-dist/tex/generic/hyphen/dehyphn.tex -runpattern f texmf/tex/generic/hyphen/dehyphtex.tex -runpattern f texmf/tex/generic/hyphen/ghyphen.README +runpattern f texmf-dist/tex/generic/hyphen/dehyphtex.tex +runpattern f texmf-dist/tex/generic/hyphen/ghyphen.README diff --git a/Master/tlpkg/tlpsrc/hyphen-greek.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-greek.tlpsrc index 3c364aa1d49..3a8183d55d0 100644 --- a/Master/tlpkg/tlpsrc/hyphen-greek.tlpsrc +++ b/Master/tlpkg/tlpsrc/hyphen-greek.tlpsrc @@ -21,7 +21,7 @@ execute AddHyphen \ file_patterns=hyph-el-polyton.pat.txt \ file_exceptions= -runpattern f texmf/tex/generic/hyphen/grmhyph5.tex -runpattern f texmf/tex/generic/hyphen/grphyph5.tex +runpattern f texmf-dist/tex/generic/hyphen/grmhyph5.tex +runpattern f texmf-dist/tex/generic/hyphen/grphyph5.tex -docpattern d texmf/doc/generic/elhyphen +docpattern d texmf-dist/doc/generic/elhyphen diff --git a/Master/tlpkg/tlpsrc/hyphen-hungarian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-hungarian.tlpsrc index d215b2e4456..c21898367fb 100644 --- a/Master/tlpkg/tlpsrc/hyphen-hungarian.tlpsrc +++ b/Master/tlpkg/tlpsrc/hyphen-hungarian.tlpsrc @@ -13,4 +13,4 @@ execute AddHyphen \ file_exceptions= -docpattern d texmf/doc/generic/huhyphen +docpattern d texmf-dist/doc/generic/huhyphen diff --git a/Master/tlpkg/tlpsrc/kpathsea.tlpsrc b/Master/tlpkg/tlpsrc/kpathsea.tlpsrc index b6899272805..5c3ba1dbdf5 100644 --- a/Master/tlpkg/tlpsrc/kpathsea.tlpsrc +++ b/Master/tlpkg/tlpsrc/kpathsea.tlpsrc @@ -1,30 +1,30 @@ category TLCore -runpattern f texmf/web2c/*.cnf -runpattern !f texmf/web2c/fmtutil-hdr.cnf -runpattern f texmf/web2c/*.opt -runpattern f texmf/web2c/*.tcx -runpattern f texmf/web2c/mktexdir -runpattern f texmf/web2c/mktexnam -runpattern f texmf/web2c/mktexupd +runpattern f texmf-dist/web2c/*.cnf +runpattern !f texmf-dist/web2c/fmtutil-hdr.cnf +runpattern f texmf-dist/web2c/*.opt +runpattern f texmf-dist/web2c/*.tcx +runpattern f texmf-dist/web2c/mktexdir +runpattern f texmf-dist/web2c/mktexnam +runpattern f texmf-dist/web2c/mktexupd # -docpattern f texmf/doc/info/dir -docpattern f texmf/doc/info/kpathsea.info* -docpattern f texmf/doc/info/tds.info -docpattern f texmf/doc/info/web2c.info* -docpattern f texmf/doc/kpathsea/* -docpattern f texmf/doc/man/man1/kpseaccess.* -docpattern f texmf/doc/man/man1/kpsereadlink.* -docpattern f texmf/doc/man/man1/kpsestat.* -docpattern f texmf/doc/man/man1/kpsewhich.* -docpattern f texmf/doc/man/man1/mkocp.* -docpattern f texmf/doc/man/man1/mkofm.* -docpattern f texmf/doc/man/man1/mktexfmt.* -docpattern f texmf/doc/man/man1/mktexlsr.* -docpattern f texmf/doc/man/man1/mktexmf.* -docpattern f texmf/doc/man/man1/mktexpk.* -docpattern f texmf/doc/man/man1/mktextfm.* -docpattern f texmf/doc/man/man1/texhash.* -docpattern f texmf/doc/web2c/* +docpattern f texmf-dist/doc/info/dir +docpattern f texmf-dist/doc/info/kpathsea.info* +docpattern f texmf-dist/doc/info/tds.info +docpattern f texmf-dist/doc/info/web2c.info* +docpattern f texmf-dist/doc/kpathsea/* +docpattern f texmf-dist/doc/man/man1/kpseaccess.* +docpattern f texmf-dist/doc/man/man1/kpsereadlink.* +docpattern f texmf-dist/doc/man/man1/kpsestat.* +docpattern f texmf-dist/doc/man/man1/kpsewhich.* +docpattern f texmf-dist/doc/man/man1/mkocp.* +docpattern f texmf-dist/doc/man/man1/mkofm.* +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.* +docpattern f texmf-dist/doc/man/man1/texhash.* +docpattern f texmf-dist/doc/web2c/* # binpattern f bin/${ARCH}/kpseaccess binpattern f bin/${ARCH}/kpsereadlink diff --git a/Master/tlpkg/tlpsrc/lacheck.tlpsrc b/Master/tlpkg/tlpsrc/lacheck.tlpsrc index 15ed3fb7e33..c6d6b110b0e 100644 --- a/Master/tlpkg/tlpsrc/lacheck.tlpsrc +++ b/Master/tlpkg/tlpsrc/lacheck.tlpsrc @@ -1,3 +1,3 @@ category TLCore -runpattern f texmf/doc/man/man1/lacheck.* +runpattern f texmf-dist/doc/man/man1/lacheck.* binpattern f bin/${ARCH}/lacheck diff --git a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc index 2d4ae387f72..a0b8acaed5a 100644 --- a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc +++ b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc @@ -23,5 +23,5 @@ execute AddFormat name=lualatex engine=luatex \ patterns=language.dat,language.dat.lua \ options="lualatex.ini" # -docpattern f texmf/doc/man/man1/latex.* -docpattern f texmf/doc/man/man1/pdflatex.* +docpattern f texmf-dist/doc/man/man1/latex.* +docpattern f texmf-dist/doc/man/man1/pdflatex.* diff --git a/Master/tlpkg/tlpsrc/latex2e-help-texinfo-spanish.tlpsrc b/Master/tlpkg/tlpsrc/latex2e-help-texinfo-spanish.tlpsrc index d22b4cdd758..f082feca318 100644 --- a/Master/tlpkg/tlpsrc/latex2e-help-texinfo-spanish.tlpsrc +++ b/Master/tlpkg/tlpsrc/latex2e-help-texinfo-spanish.tlpsrc @@ -1 +1 @@ -docpattern +f texmf/doc/info/latex2e-es.info +docpattern +f texmf-dist/doc/info/latex2e-es.info diff --git a/Master/tlpkg/tlpsrc/latex2e-help-texinfo.tlpsrc b/Master/tlpkg/tlpsrc/latex2e-help-texinfo.tlpsrc index 751cff18e53..23abb0d191d 100644 --- a/Master/tlpkg/tlpsrc/latex2e-help-texinfo.tlpsrc +++ b/Master/tlpkg/tlpsrc/latex2e-help-texinfo.tlpsrc @@ -1 +1 @@ -docpattern +f texmf/doc/info/latex2e.info +docpattern +f texmf-dist/doc/info/latex2e.info diff --git a/Master/tlpkg/tlpsrc/latex2man.tlpsrc b/Master/tlpkg/tlpsrc/latex2man.tlpsrc index 721a347cd4d..69946abce69 100644 --- a/Master/tlpkg/tlpsrc/latex2man.tlpsrc +++ b/Master/tlpkg/tlpsrc/latex2man.tlpsrc @@ -1,2 +1,2 @@ binpattern f bin/${ARCH}/${PKGNAME} -docpattern +f texmf/doc/info/${PKGNAME}.info +docpattern +f texmf-dist/doc/info/${PKGNAME}.info diff --git a/Master/tlpkg/tlpsrc/latexdiff.tlpsrc b/Master/tlpkg/tlpsrc/latexdiff.tlpsrc index 4f7d7e31717..1fd4b457736 100644 --- a/Master/tlpkg/tlpsrc/latexdiff.tlpsrc +++ b/Master/tlpkg/tlpsrc/latexdiff.tlpsrc @@ -1,6 +1,6 @@ -docpattern +f texmf/doc/man/man1/latexdiff-vc.* -docpattern +f texmf/doc/man/man1/latexrevise.* -docpattern +f texmf/doc/man/man1/latexdiff.* +docpattern +f texmf-dist/doc/man/man1/latexdiff-vc.* +docpattern +f texmf-dist/doc/man/man1/latexrevise.* +docpattern +f texmf-dist/doc/man/man1/latexdiff.* binpattern f bin/${ARCH}/latexdiff binpattern f bin/${ARCH}/latexdiff-vc binpattern f bin/${ARCH}/latexrevise diff --git a/Master/tlpkg/tlpsrc/latexmk.tlpsrc b/Master/tlpkg/tlpsrc/latexmk.tlpsrc index b086c0c650a..745e64e018f 100644 --- a/Master/tlpkg/tlpsrc/latexmk.tlpsrc +++ b/Master/tlpkg/tlpsrc/latexmk.tlpsrc @@ -1,2 +1,2 @@ binpattern f bin/${ARCH}/${PKGNAME} -docpattern +f texmf/doc/man/man1/${PKGNAME}.* +docpattern +f texmf-dist/doc/man/man1/${PKGNAME}.* diff --git a/Master/tlpkg/tlpsrc/lcdftypetools.tlpsrc b/Master/tlpkg/tlpsrc/lcdftypetools.tlpsrc index 04752ec4294..9caa9deaeff 100644 --- a/Master/tlpkg/tlpsrc/lcdftypetools.tlpsrc +++ b/Master/tlpkg/tlpsrc/lcdftypetools.tlpsrc @@ -1,17 +1,17 @@ category TLCore catalogue lcdf-typetools depend glyphlist -docpattern f texmf/doc/man/man1/cfftot1.* -docpattern f texmf/doc/man/man1/mmafm.* -docpattern f texmf/doc/man/man1/mmpfb.* -docpattern f texmf/doc/man/man1/otfinfo.* -docpattern f texmf/doc/man/man1/otftotfm.* -docpattern f texmf/doc/man/man1/t1dotlessj.* -docpattern f texmf/doc/man/man1/t1lint.* -docpattern f texmf/doc/man/man1/t1rawafm.* -docpattern f texmf/doc/man/man1/t1reencode.* -docpattern f texmf/doc/man/man1/t1testpage.* -docpattern f texmf/doc/man/man1/ttftotype42.* +docpattern f texmf-dist/doc/man/man1/cfftot1.* +docpattern f texmf-dist/doc/man/man1/mmafm.* +docpattern f texmf-dist/doc/man/man1/mmpfb.* +docpattern f texmf-dist/doc/man/man1/otfinfo.* +docpattern f texmf-dist/doc/man/man1/otftotfm.* +docpattern f texmf-dist/doc/man/man1/t1dotlessj.* +docpattern f texmf-dist/doc/man/man1/t1lint.* +docpattern f texmf-dist/doc/man/man1/t1rawafm.* +docpattern f texmf-dist/doc/man/man1/t1reencode.* +docpattern f texmf-dist/doc/man/man1/t1testpage.* +docpattern f texmf-dist/doc/man/man1/ttftotype42.* binpattern f bin/${ARCH}/cfftot1 binpattern f bin/${ARCH}/mmafm binpattern f bin/${ARCH}/mmpfb diff --git a/Master/tlpkg/tlpsrc/luatex.tlpsrc b/Master/tlpkg/tlpsrc/luatex.tlpsrc index 14dbfe1af99..ce1c52a5f88 100644 --- a/Master/tlpkg/tlpsrc/luatex.tlpsrc +++ b/Master/tlpkg/tlpsrc/luatex.tlpsrc @@ -8,12 +8,12 @@ execute AddFormat \ options="dviluatex.ini" # docpattern d texmf-dist/doc/luatex/base -docpattern f texmf/doc/man/man1/luatex.* -docpattern f texmf/doc/man/man1/texlua* +docpattern f texmf-dist/doc/man/man1/luatex.* +docpattern f texmf-dist/doc/man/man1/texlua* # -runpattern f texmf/tex/generic/config/luatexiniconfig.tex -runpattern f texmf/tex/generic/config/luatex-unicode-letters.tex -runpattern f texmf/web2c/texmfcnf.lua +runpattern f texmf-dist/tex/generic/config/luatexiniconfig.tex +runpattern f texmf-dist/tex/generic/config/luatex-unicode-letters.tex +runpattern f texmf-dist/web2c/texmfcnf.lua # binpattern f bin/${ARCH}/dviluatex binpattern f bin/${ARCH}/luatex diff --git a/Master/tlpkg/tlpsrc/m-tx.tlpsrc b/Master/tlpkg/tlpsrc/m-tx.tlpsrc index 8421dddbf7f..572e628fc83 100644 --- a/Master/tlpkg/tlpsrc/m-tx.tlpsrc +++ b/Master/tlpkg/tlpsrc/m-tx.tlpsrc @@ -1,4 +1,4 @@ binpattern f bin/${ARCH}/${PKGNAME} binpattern f bin/${ARCH}/prepmx # -docpattern +f texmf/doc/man/man1/prepmx.* +docpattern +f texmf-dist/doc/man/man1/prepmx.* diff --git a/Master/tlpkg/tlpsrc/makeindex.tlpsrc b/Master/tlpkg/tlpsrc/makeindex.tlpsrc index f795abee5c2..b10ecb83a34 100644 --- a/Master/tlpkg/tlpsrc/makeindex.tlpsrc +++ b/Master/tlpkg/tlpsrc/makeindex.tlpsrc @@ -1,5 +1,5 @@ binpattern f bin/${ARCH}/makeindex binpattern f bin/${ARCH}/mkindex runpattern d texmf-dist/makeindex/base -docpattern +f texmf/doc/man/man1/makeindex.* -docpattern +f texmf/doc/man/man1/mkindex.* +docpattern +f texmf-dist/doc/man/man1/makeindex.* +docpattern +f texmf-dist/doc/man/man1/mkindex.* diff --git a/Master/tlpkg/tlpsrc/metafont.tlpsrc b/Master/tlpkg/tlpsrc/metafont.tlpsrc index 5eb5cb4c7fe..019dfbc4dda 100644 --- a/Master/tlpkg/tlpsrc/metafont.tlpsrc +++ b/Master/tlpkg/tlpsrc/metafont.tlpsrc @@ -8,8 +8,8 @@ runpattern d texmf-dist/metafont/base runpattern d texmf-dist/metafont/config runpattern d texmf-dist/metafont/misc # -docpattern f texmf/doc/man/man1/mf-nowin.* -docpattern f texmf/doc/man/man1/mf.* +docpattern f texmf-dist/doc/man/man1/mf-nowin.* +docpattern f texmf-dist/doc/man/man1/mf.* # binpattern f bin/${ARCH}/inimf binpattern f bin/${ARCH}/mf diff --git a/Master/tlpkg/tlpsrc/metapost.tlpsrc b/Master/tlpkg/tlpsrc/metapost.tlpsrc index a1b457bb10a..c26d67ad74f 100644 --- a/Master/tlpkg/tlpsrc/metapost.tlpsrc +++ b/Master/tlpkg/tlpsrc/metapost.tlpsrc @@ -9,8 +9,8 @@ binpattern f bin/${ARCH}/mfplain binpattern f bin/${ARCH}/mpost # docpattern d texmf-dist/doc/metapost/base -docpattern f texmf/doc/man/man1/dvitomp.* -docpattern f texmf/doc/man/man1/mpost.* +docpattern f texmf-dist/doc/man/man1/dvitomp.* +docpattern f texmf-dist/doc/man/man1/mpost.* # runpattern d texmf-dist/metapost/base runpattern d texmf-dist/metapost/config diff --git a/Master/tlpkg/tlpsrc/mf2pt1.tlpsrc b/Master/tlpkg/tlpsrc/mf2pt1.tlpsrc index 53e84dc4a15..453cb2fb0ed 100644 --- a/Master/tlpkg/tlpsrc/mf2pt1.tlpsrc +++ b/Master/tlpkg/tlpsrc/mf2pt1.tlpsrc @@ -1,2 +1,2 @@ binpattern f bin/${ARCH}/mf2pt1 -docpattern +f texmf/doc/info/mf2pt1.info +docpattern +f texmf-dist/doc/info/mf2pt1.info diff --git a/Master/tlpkg/tlpsrc/mfware.tlpsrc b/Master/tlpkg/tlpsrc/mfware.tlpsrc index 55bb4cfafba..f6a365b3b62 100644 --- a/Master/tlpkg/tlpsrc/mfware.tlpsrc +++ b/Master/tlpkg/tlpsrc/mfware.tlpsrc @@ -1,10 +1,10 @@ category TLCore -docpattern f texmf/doc/man/man1/gftodvi.* -docpattern f texmf/doc/man/man1/gftopk.* -docpattern f texmf/doc/man/man1/gftype.* -docpattern f texmf/doc/man/man1/mft.* -docpattern f texmf/doc/man/man1/pktogf.* -docpattern f texmf/doc/man/man1/pktype.* +docpattern f texmf-dist/doc/man/man1/gftodvi.* +docpattern f texmf-dist/doc/man/man1/gftopk.* +docpattern f texmf-dist/doc/man/man1/gftype.* +docpattern f texmf-dist/doc/man/man1/mft.* +docpattern f texmf-dist/doc/man/man1/pktogf.* +docpattern f texmf-dist/doc/man/man1/pktype.* binpattern f bin/${ARCH}/gftodvi binpattern f bin/${ARCH}/gftopk binpattern f bin/${ARCH}/gftype diff --git a/Master/tlpkg/tlpsrc/mkjobtexmf.tlpsrc b/Master/tlpkg/tlpsrc/mkjobtexmf.tlpsrc index 483f5cfd355..44f85550b5d 100644 --- a/Master/tlpkg/tlpsrc/mkjobtexmf.tlpsrc +++ b/Master/tlpkg/tlpsrc/mkjobtexmf.tlpsrc @@ -1,4 +1,4 @@ binpattern f bin/${ARCH}/${PKGNAME} docpattern d texmf-dist/doc/generic/${PKGNAME} -docpattern f texmf/doc/man/man1/${PKGNAME}.* +docpattern f texmf-dist/doc/man/man1/${PKGNAME}.* runpattern d texmf-dist/scripts/${PKGNAME} diff --git a/Master/tlpkg/tlpsrc/mptopdf.tlpsrc b/Master/tlpkg/tlpsrc/mptopdf.tlpsrc index 4a0acef1b08..5827d0c9973 100644 --- a/Master/tlpkg/tlpsrc/mptopdf.tlpsrc +++ b/Master/tlpkg/tlpsrc/mptopdf.tlpsrc @@ -22,7 +22,7 @@ runpattern f texmf-dist/tex/generic/context/mptopdf/mptopdf.tex # binpattern f bin/${ARCH}/mptopdf # -docpattern +f texmf/doc/man/man1/mptopdf.* +docpattern +f texmf-dist/doc/man/man1/mptopdf.* # more info: # diff --git a/Master/tlpkg/tlpsrc/musixtex.tlpsrc b/Master/tlpkg/tlpsrc/musixtex.tlpsrc index 11064560623..11782ac645d 100644 --- a/Master/tlpkg/tlpsrc/musixtex.tlpsrc +++ b/Master/tlpkg/tlpsrc/musixtex.tlpsrc @@ -1,3 +1,3 @@ binpattern f bin/${ARCH}/musixflx binpattern f bin/${ARCH}/musixtex -docpattern +f texmf/doc/man/man1/musix* +docpattern +f texmf-dist/doc/man/man1/musix* diff --git a/Master/tlpkg/tlpsrc/omegaware.tlpsrc b/Master/tlpkg/tlpsrc/omegaware.tlpsrc index 441d98a78a5..7506c5f9633 100644 --- a/Master/tlpkg/tlpsrc/omegaware.tlpsrc +++ b/Master/tlpkg/tlpsrc/omegaware.tlpsrc @@ -1,12 +1,12 @@ category TLCore -docpattern f texmf/doc/man/man1/odvi* -docpattern f texmf/doc/man/man1/ofm2opl.* -docpattern f texmf/doc/man/man1/opl2ofm.* -docpattern f texmf/doc/man/man1/otp2ocp.* -docpattern f texmf/doc/man/man1/otangle.* -docpattern f texmf/doc/man/man1/outocp* -docpattern f texmf/doc/man/man1/ovf2ovp.* -docpattern f texmf/doc/man/man1/ovp2ovf.* +docpattern f texmf-dist/doc/man/man1/odvi* +docpattern f texmf-dist/doc/man/man1/ofm2opl.* +docpattern f texmf-dist/doc/man/man1/opl2ofm.* +docpattern f texmf-dist/doc/man/man1/otp2ocp.* +docpattern f texmf-dist/doc/man/man1/otangle.* +docpattern f texmf-dist/doc/man/man1/outocp* +docpattern f texmf-dist/doc/man/man1/ovf2ovp.* +docpattern f texmf-dist/doc/man/man1/ovp2ovf.* # binpattern f bin/${ARCH}/odvicopy binpattern f bin/${ARCH}/odvitype diff --git a/Master/tlpkg/tlpsrc/patgen.tlpsrc b/Master/tlpkg/tlpsrc/patgen.tlpsrc index dd86ed5ea47..47f4f46b707 100644 --- a/Master/tlpkg/tlpsrc/patgen.tlpsrc +++ b/Master/tlpkg/tlpsrc/patgen.tlpsrc @@ -1,4 +1,4 @@ category TLCore depend kpathsea -docpattern f texmf/doc/man/man1/patgen.* +docpattern f texmf-dist/doc/man/man1/patgen.* binpattern f bin/${ARCH}/patgen diff --git a/Master/tlpkg/tlpsrc/pdfjam.tlpsrc b/Master/tlpkg/tlpsrc/pdfjam.tlpsrc index 9fa2eee0862..0abd4f34917 100644 --- a/Master/tlpkg/tlpsrc/pdfjam.tlpsrc +++ b/Master/tlpkg/tlpsrc/pdfjam.tlpsrc @@ -24,15 +24,15 @@ runpattern f texmf-dist/scripts/pdfjam/pdfjoin runpattern f texmf-dist/scripts/pdfjam/pdfnup runpattern f texmf-dist/scripts/pdfjam/pdfpun # -docpattern +f texmf/doc/man/man1/pdf180.* -docpattern +f texmf/doc/man/man1/pdf270.* -docpattern +f texmf/doc/man/man1/pdf90.* -docpattern +f texmf/doc/man/man1/pdfbook.* -docpattern +f texmf/doc/man/man1/pdfflip.* -docpattern +f texmf/doc/man/man1/pdfjam-pocketmod.* -docpattern +f texmf/doc/man/man1/pdfjam-slides3up.* -docpattern +f texmf/doc/man/man1/pdfjam-slides6up.* -docpattern +f texmf/doc/man/man1/pdfjam.* -docpattern +f texmf/doc/man/man1/pdfjoin.* -docpattern +f texmf/doc/man/man1/pdfnup.* -docpattern +f texmf/doc/man/man1/pdfpun.* +docpattern +f texmf-dist/doc/man/man1/pdf180.* +docpattern +f texmf-dist/doc/man/man1/pdf270.* +docpattern +f texmf-dist/doc/man/man1/pdf90.* +docpattern +f texmf-dist/doc/man/man1/pdfbook.* +docpattern +f texmf-dist/doc/man/man1/pdfflip.* +docpattern +f texmf-dist/doc/man/man1/pdfjam-pocketmod.* +docpattern +f texmf-dist/doc/man/man1/pdfjam-slides3up.* +docpattern +f texmf-dist/doc/man/man1/pdfjam-slides6up.* +docpattern +f texmf-dist/doc/man/man1/pdfjam.* +docpattern +f texmf-dist/doc/man/man1/pdfjoin.* +docpattern +f texmf-dist/doc/man/man1/pdfnup.* +docpattern +f texmf-dist/doc/man/man1/pdfpun.* diff --git a/Master/tlpkg/tlpsrc/pdftex.tlpsrc b/Master/tlpkg/tlpsrc/pdftex.tlpsrc index 2b28fd577d0..fbbf4683fd4 100644 --- a/Master/tlpkg/tlpsrc/pdftex.tlpsrc +++ b/Master/tlpkg/tlpsrc/pdftex.tlpsrc @@ -6,12 +6,12 @@ execute AddFormat name=etex engine=pdftex patterns=language.def \ options="-translate-file=cp227.tcx *etex.ini" execute AddFormat name=pdfetex engine=pdftex patterns=language.def \ options="-translate-file=cp227.tcx *pdfetex.ini" -runpattern f texmf/fonts/map/pdftex/updmap/* -runpattern f texmf/tex/generic/config/pdftex*.tex -runpattern f texmf/tex/generic/pdftex/* +runpattern f texmf-dist/fonts/map/pdftex/updmap/* +runpattern f texmf-dist/tex/generic/config/pdftex*.tex +runpattern f texmf-dist/tex/generic/pdftex/* runpattern d texmf-dist/scripts/simpdftex -docpattern f texmf/doc/man/man1/pdfetex.* -docpattern f texmf/doc/man/man1/pdftex.* +docpattern f texmf-dist/doc/man/man1/pdfetex.* +docpattern f texmf-dist/doc/man/man1/pdftex.* docpattern d texmf-dist/doc/pdftex binpattern f bin/${ARCH}/etex binpattern f bin/${ARCH}/pdfetex diff --git a/Master/tlpkg/tlpsrc/pdftools.tlpsrc b/Master/tlpkg/tlpsrc/pdftools.tlpsrc index f526ff4d2a5..d6e200b083f 100644 --- a/Master/tlpkg/tlpsrc/pdftools.tlpsrc +++ b/Master/tlpkg/tlpsrc/pdftools.tlpsrc @@ -8,8 +8,8 @@ binpattern f bin/win32/pdfdde.exe binpattern f bin/${ARCH}/pdfclose binpattern f bin/${ARCH}/pdfopen # -docpattern f texmf/doc/man/man1/e2pall.* -docpattern f texmf/doc/man/man1/pdfclose.* -docpattern f texmf/doc/man/man1/pdfopen.* -docpattern f texmf/doc/man/man1/pdftosrc.* +docpattern f texmf-dist/doc/man/man1/e2pall.* +docpattern f texmf-dist/doc/man/man1/pdfclose.* +docpattern f texmf-dist/doc/man/man1/pdfopen.* +docpattern f texmf-dist/doc/man/man1/pdftosrc.* runpattern f texmf-dist/scripts/tetex/e2pall.pl diff --git a/Master/tlpkg/tlpsrc/perltex.tlpsrc b/Master/tlpkg/tlpsrc/perltex.tlpsrc index f624d0dbcec..a9e898be854 100644 --- a/Master/tlpkg/tlpsrc/perltex.tlpsrc +++ b/Master/tlpkg/tlpsrc/perltex.tlpsrc @@ -1,3 +1,3 @@ binpattern f bin/${ARCH}/${PKGNAME} -docpattern +f texmf/doc/man/man1/${PKGNAME}.* +docpattern +f texmf-dist/doc/man/man1/${PKGNAME}.* diff --git a/Master/tlpkg/tlpsrc/pkfix-helper.tlpsrc b/Master/tlpkg/tlpsrc/pkfix-helper.tlpsrc index ac14e5d390a..63820d5fdfb 100644 --- a/Master/tlpkg/tlpsrc/pkfix-helper.tlpsrc +++ b/Master/tlpkg/tlpsrc/pkfix-helper.tlpsrc @@ -1,2 +1,2 @@ -docpattern +f texmf/doc/man/man1/pkfix-helper.* +docpattern +f texmf-dist/doc/man/man1/pkfix-helper.* binpattern f bin/${ARCH}/pkfix-helper diff --git a/Master/tlpkg/tlpsrc/pmx.tlpsrc b/Master/tlpkg/tlpsrc/pmx.tlpsrc index 0b607f6cda1..65de47076a9 100644 --- a/Master/tlpkg/tlpsrc/pmx.tlpsrc +++ b/Master/tlpkg/tlpsrc/pmx.tlpsrc @@ -2,7 +2,7 @@ binpattern f bin/${ARCH}/pmx2pdf binpattern f bin/${ARCH}/pmxab binpattern f bin/${ARCH}/scor2prt # -docpattern +f texmf/doc/man/man1/pmx2pdf.* -docpattern +f texmf/doc/man/man1/pmxab.* -docpattern +f texmf/doc/man/man1/scor2prt.* +docpattern +f texmf-dist/doc/man/man1/pmx2pdf.* +docpattern +f texmf-dist/doc/man/man1/pmxab.* +docpattern +f texmf-dist/doc/man/man1/scor2prt.* diff --git a/Master/tlpkg/tlpsrc/ps2pkm.tlpsrc b/Master/tlpkg/tlpsrc/ps2pkm.tlpsrc index d49a2600051..95997d56c43 100644 --- a/Master/tlpkg/tlpsrc/ps2pkm.tlpsrc +++ b/Master/tlpkg/tlpsrc/ps2pkm.tlpsrc @@ -1,8 +1,8 @@ category TLCore -runpattern f texmf/doc/man/man1/mag.* -runpattern f texmf/doc/man/man1/pfb2pfa.* -runpattern f texmf/doc/man/man1/pk2bm.* -runpattern f texmf/doc/man/man1/ps2pk.* +runpattern f texmf-dist/doc/man/man1/mag.* +runpattern f texmf-dist/doc/man/man1/pfb2pfa.* +runpattern f texmf-dist/doc/man/man1/pk2bm.* +runpattern f texmf-dist/doc/man/man1/ps2pk.* binpattern f bin/${ARCH}/mag binpattern f bin/${ARCH}/pfb2pfa binpattern f bin/${ARCH}/pk2bm diff --git a/Master/tlpkg/tlpsrc/pstools.tlpsrc b/Master/tlpkg/tlpsrc/pstools.tlpsrc index e09e3d9cde7..d9f53b0fc14 100644 --- a/Master/tlpkg/tlpsrc/pstools.tlpsrc +++ b/Master/tlpkg/tlpsrc/pstools.tlpsrc @@ -1,9 +1,9 @@ category TLCore -docpattern f texmf/doc/man/man1/bbox.* -docpattern f texmf/doc/man/man1/ps2eps.* -docpattern f texmf/doc/man/man1/ps2frag.* -docpattern f texmf/doc/man/man1/pslatex.* -runpattern d texmf/scripts/ps2eps +docpattern f texmf-dist/doc/man/man1/bbox.* +docpattern f texmf-dist/doc/man/man1/ps2eps.* +docpattern f texmf-dist/doc/man/man1/ps2frag.* +docpattern f texmf-dist/doc/man/man1/pslatex.* +runpattern d texmf-dist/scripts/ps2eps runpattern f texmf-dist/scripts/tetex/ps2frag.sh runpattern f texmf-dist/scripts/tetex/pslatex.sh binpattern f bin/${ARCH}/bbox diff --git a/Master/tlpkg/tlpsrc/psutils.tlpsrc b/Master/tlpkg/tlpsrc/psutils.tlpsrc index 5aa0ba482bd..f6661f9224c 100644 --- a/Master/tlpkg/tlpsrc/psutils.tlpsrc +++ b/Master/tlpkg/tlpsrc/psutils.tlpsrc @@ -1,25 +1,25 @@ category TLCore -docpattern f texmf/doc/man/man1/epsffit.* -docpattern f texmf/doc/man/man1/extractres.* -docpattern f texmf/doc/man/man1/fixdlsrps.* -docpattern f texmf/doc/man/man1/fixfmps.* -docpattern f texmf/doc/man/man1/fixpsditps.* -docpattern f texmf/doc/man/man1/fixpspps.* -docpattern f texmf/doc/man/man1/fixscribeps.* -docpattern f texmf/doc/man/man1/fixtpps.* -docpattern f texmf/doc/man/man1/fixwfwps.* -docpattern f texmf/doc/man/man1/fixwpps.* -docpattern f texmf/doc/man/man1/fixwwps.* -docpattern f texmf/doc/man/man1/getafm.* -docpattern f texmf/doc/man/man1/includeres.* -docpattern f texmf/doc/man/man1/psbook.* -docpattern f texmf/doc/man/man1/psmerge.* -docpattern f texmf/doc/man/man1/psnup.* -docpattern f texmf/doc/man/man1/psresize.* -docpattern f texmf/doc/man/man1/psselect.* -docpattern f texmf/doc/man/man1/pstops.* -runpattern d texmf/scripts/psutils -runpattern f texmf/dvips/getafm/* +docpattern f texmf-dist/doc/man/man1/epsffit.* +docpattern f texmf-dist/doc/man/man1/extractres.* +docpattern f texmf-dist/doc/man/man1/fixdlsrps.* +docpattern f texmf-dist/doc/man/man1/fixfmps.* +docpattern f texmf-dist/doc/man/man1/fixpsditps.* +docpattern f texmf-dist/doc/man/man1/fixpspps.* +docpattern f texmf-dist/doc/man/man1/fixscribeps.* +docpattern f texmf-dist/doc/man/man1/fixtpps.* +docpattern f texmf-dist/doc/man/man1/fixwfwps.* +docpattern f texmf-dist/doc/man/man1/fixwpps.* +docpattern f texmf-dist/doc/man/man1/fixwwps.* +docpattern f texmf-dist/doc/man/man1/getafm.* +docpattern f texmf-dist/doc/man/man1/includeres.* +docpattern f texmf-dist/doc/man/man1/psbook.* +docpattern f texmf-dist/doc/man/man1/psmerge.* +docpattern f texmf-dist/doc/man/man1/psnup.* +docpattern f texmf-dist/doc/man/man1/psresize.* +docpattern f texmf-dist/doc/man/man1/psselect.* +docpattern f texmf-dist/doc/man/man1/pstops.* +runpattern d texmf-dist/scripts/psutils +runpattern f texmf-dist/dvips/getafm/* binpattern f bin/${ARCH}/epsffit binpattern f bin/${ARCH}/extractres binpattern f bin/${ARCH}/fixdlsrps diff --git a/Master/tlpkg/tlpsrc/ptex.tlpsrc b/Master/tlpkg/tlpsrc/ptex.tlpsrc index 0ecb644ac0d..b495ae629d6 100644 --- a/Master/tlpkg/tlpsrc/ptex.tlpsrc +++ b/Master/tlpkg/tlpsrc/ptex.tlpsrc @@ -31,4 +31,4 @@ runpattern +!d texmf-dist/tex/generic/hyph-utf8/patterns/ptex # srcpattern +d texmf-dist/source/platex/base # -docpattern +f texmf/doc/man/man1/mendex.* +docpattern +f texmf-dist/doc/man/man1/mendex.* diff --git a/Master/tlpkg/tlpsrc/purifyeps.tlpsrc b/Master/tlpkg/tlpsrc/purifyeps.tlpsrc index b086c0c650a..745e64e018f 100644 --- a/Master/tlpkg/tlpsrc/purifyeps.tlpsrc +++ b/Master/tlpkg/tlpsrc/purifyeps.tlpsrc @@ -1,2 +1,2 @@ binpattern f bin/${ARCH}/${PKGNAME} -docpattern +f texmf/doc/man/man1/${PKGNAME}.* +docpattern +f texmf-dist/doc/man/man1/${PKGNAME}.* diff --git a/Master/tlpkg/tlpsrc/seetexk.tlpsrc b/Master/tlpkg/tlpsrc/seetexk.tlpsrc index f00733dbd4b..95711d6a329 100644 --- a/Master/tlpkg/tlpsrc/seetexk.tlpsrc +++ b/Master/tlpkg/tlpsrc/seetexk.tlpsrc @@ -1,9 +1,9 @@ category TLCore catalogue dvibook -runpattern f texmf/doc/man/man1/dvibook.* -runpattern f texmf/doc/man/man1/dviconcat.* -runpattern f texmf/doc/man/man1/dviselect.* -runpattern f texmf/doc/man/man1/dvitodvi.* +runpattern f texmf-dist/doc/man/man1/dvibook.* +runpattern f texmf-dist/doc/man/man1/dviconcat.* +runpattern f texmf-dist/doc/man/man1/dviselect.* +runpattern f texmf-dist/doc/man/man1/dvitodvi.* binpattern f bin/${ARCH}/dvibook binpattern f bin/${ARCH}/dviconcat binpattern f bin/${ARCH}/dviselect diff --git a/Master/tlpkg/tlpsrc/splitindex.tlpsrc b/Master/tlpkg/tlpsrc/splitindex.tlpsrc index b086c0c650a..745e64e018f 100644 --- a/Master/tlpkg/tlpsrc/splitindex.tlpsrc +++ b/Master/tlpkg/tlpsrc/splitindex.tlpsrc @@ -1,2 +1,2 @@ binpattern f bin/${ARCH}/${PKGNAME} -docpattern +f texmf/doc/man/man1/${PKGNAME}.* +docpattern +f texmf-dist/doc/man/man1/${PKGNAME}.* diff --git a/Master/tlpkg/tlpsrc/synctex.tlpsrc b/Master/tlpkg/tlpsrc/synctex.tlpsrc index 9de4548e23e..2c912d35caa 100644 --- a/Master/tlpkg/tlpsrc/synctex.tlpsrc +++ b/Master/tlpkg/tlpsrc/synctex.tlpsrc @@ -1,4 +1,4 @@ category TLCore binpattern f bin/${ARCH}/synctex -docpattern f texmf/doc/man/man1/synctex.* -docpattern f texmf/doc/man/man5/synctex.* +docpattern f texmf-dist/doc/man/man1/synctex.* +docpattern f texmf-dist/doc/man/man5/synctex.* diff --git a/Master/tlpkg/tlpsrc/t1utils.tlpsrc b/Master/tlpkg/tlpsrc/t1utils.tlpsrc index eaa30b33860..bb1e6a14bbf 100644 --- a/Master/tlpkg/tlpsrc/t1utils.tlpsrc +++ b/Master/tlpkg/tlpsrc/t1utils.tlpsrc @@ -1,10 +1,10 @@ category TLCore -docpattern f texmf/doc/man/man1/t1ascii.* -docpattern f texmf/doc/man/man1/t1asm.* -docpattern f texmf/doc/man/man1/t1binary.* -docpattern f texmf/doc/man/man1/t1disasm.* -docpattern f texmf/doc/man/man1/t1mac.* -docpattern f texmf/doc/man/man1/t1unmac.* +docpattern f texmf-dist/doc/man/man1/t1ascii.* +docpattern f texmf-dist/doc/man/man1/t1asm.* +docpattern f texmf-dist/doc/man/man1/t1binary.* +docpattern f texmf-dist/doc/man/man1/t1disasm.* +docpattern f texmf-dist/doc/man/man1/t1mac.* +docpattern f texmf-dist/doc/man/man1/t1unmac.* binpattern f bin/${ARCH}/t1ascii binpattern f bin/${ARCH}/t1asm binpattern f bin/${ARCH}/t1binary diff --git a/Master/tlpkg/tlpsrc/tetex.tlpsrc b/Master/tlpkg/tlpsrc/tetex.tlpsrc index cf47b649834..f6888221495 100644 --- a/Master/tlpkg/tlpsrc/tetex.tlpsrc +++ b/Master/tlpkg/tlpsrc/tetex.tlpsrc @@ -5,10 +5,10 @@ shortdesc scripts and files originally written for or included in teTeX # is maintained in the tetex directory. execute addMap mathpple.map -runpattern f texmf/dvips/tetex/* -runpattern f texmf/fonts/enc/dvips/tetex/* -runpattern f texmf/fonts/map/dvips/tetex/* -runpattern f texmf/web2c/updmap.cfg +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/updmap.cfg runpattern f texmf-dist/web2c/updmap.cfg runpattern f texmf-dist/scripts/tetex/allcm.sh runpattern f texmf-dist/scripts/tetex/allneeded.sh @@ -19,27 +19,27 @@ runpattern f texmf-dist/scripts/tetex/kpsetool.sh runpattern f texmf-dist/scripts/tetex/updmap.pl runpattern f texmf-dist/scripts/tetex/updmap-sys.sh # -runpattern f texmf/scripts/tetex/fmtutil.sh -runpattern f texmf/scripts/tetex/fmtutil-sys.sh -runpattern f texmf/scripts/tetex/texconfig-dialog.sh -runpattern f texmf/scripts/tetex/texconfig-sys.sh -runpattern f texmf/scripts/tetex/texlinks.sh +runpattern f texmf-dist/scripts/tetex/fmtutil.sh +runpattern f texmf-dist/scripts/tetex/fmtutil-sys.sh +runpattern f texmf-dist/scripts/tetex/texconfig-dialog.sh +runpattern f texmf-dist/scripts/tetex/texconfig-sys.sh +runpattern f texmf-dist/scripts/tetex/texlinks.sh -docpattern f texmf/doc/man/man1/allcm.* -docpattern f texmf/doc/man/man1/allec.* -docpattern f texmf/doc/man/man1/allneeded.* -docpattern f texmf/doc/man/man1/dvi2fax.* -docpattern f texmf/doc/man/man1/dvired.* -docpattern f texmf/doc/man/man1/fmtutil* -docpattern f texmf/doc/man/man1/kpsepath.* -docpattern f texmf/doc/man/man1/kpsetool.* -docpattern f texmf/doc/man/man1/kpsewhere.* -docpattern f texmf/doc/man/man1/kpsexpand.* -docpattern f texmf/doc/man/man1/texlinks.* -docpattern f texmf/doc/man/man1/updmap* -docpattern f texmf/doc/man/man5/fmtutil.cnf.* -docpattern f texmf/doc/man/man5/updmap.* -docpattern f texmf/doc/tetex/* +docpattern f texmf-dist/doc/man/man1/allcm.* +docpattern f texmf-dist/doc/man/man1/allec.* +docpattern f texmf-dist/doc/man/man1/allneeded.* +docpattern f texmf-dist/doc/man/man1/dvi2fax.* +docpattern f texmf-dist/doc/man/man1/dvired.* +docpattern f texmf-dist/doc/man/man1/fmtutil* +docpattern f texmf-dist/doc/man/man1/kpsepath.* +docpattern f texmf-dist/doc/man/man1/kpsetool.* +docpattern f texmf-dist/doc/man/man1/kpsewhere.* +docpattern f texmf-dist/doc/man/man1/kpsexpand.* +docpattern f texmf-dist/doc/man/man1/texlinks.* +docpattern f texmf-dist/doc/man/man1/updmap* +docpattern f texmf-dist/doc/man/man5/fmtutil.cnf.* +docpattern f texmf-dist/doc/man/man5/updmap.* +docpattern f texmf-dist/doc/tetex/* binpattern f bin/${ARCH}/allcm binpattern f bin/${ARCH}/allec diff --git a/Master/tlpkg/tlpsrc/tex.tlpsrc b/Master/tlpkg/tlpsrc/tex.tlpsrc index c56c2b451e9..9dd4e6d1c27 100644 --- a/Master/tlpkg/tlpsrc/tex.tlpsrc +++ b/Master/tlpkg/tlpsrc/tex.tlpsrc @@ -4,7 +4,7 @@ execute AddFormat name=tex engine=tex options="tex.ini" depend kpathsea depend plain # -docpattern f texmf/doc/man/man1/tex.* +docpattern f texmf-dist/doc/man/man1/tex.* # binpattern f bin/${ARCH}/initex binpattern f bin/${ARCH}/tex diff --git a/Master/tlpkg/tlpsrc/tex4ht.tlpsrc b/Master/tlpkg/tlpsrc/tex4ht.tlpsrc index cb007970e31..e0e9fa4c041 100644 --- a/Master/tlpkg/tlpsrc/tex4ht.tlpsrc +++ b/Master/tlpkg/tlpsrc/tex4ht.tlpsrc @@ -14,4 +14,4 @@ docpattern d texmf-dist/doc/generic/tex4ht runpattern d texmf-dist/scripts/tex4ht runpattern d texmf-dist/tex/generic/tex4ht runpattern d texmf-dist/tex4ht -runpattern d texmf/scripts/tex4ht +runpattern d texmf-dist/scripts/tex4ht diff --git a/Master/tlpkg/tlpsrc/texconfig.tlpsrc b/Master/tlpkg/tlpsrc/texconfig.tlpsrc index ced5fc507e6..48cc977e181 100644 --- a/Master/tlpkg/tlpsrc/texconfig.tlpsrc +++ b/Master/tlpkg/tlpsrc/texconfig.tlpsrc @@ -1,8 +1,8 @@ category TLCore -runpattern f texmf/scripts/tetex/texconfig.sh -runpattern f texmf/texconfig/* -runpattern f texmf/texconfig/g/* -runpattern f texmf/texconfig/v/* -runpattern f texmf/texconfig/x/* -docpattern f texmf/doc/man/man1/texconfig* +runpattern f texmf-dist/scripts/tetex/texconfig.sh +runpattern f texmf-dist/texconfig/* +runpattern f texmf-dist/texconfig/g/* +runpattern f texmf-dist/texconfig/v/* +runpattern f texmf-dist/texconfig/x/* +docpattern f texmf-dist/doc/man/man1/texconfig* binpattern f bin/${ARCH}/texconfig diff --git a/Master/tlpkg/tlpsrc/texdiff.tlpsrc b/Master/tlpkg/tlpsrc/texdiff.tlpsrc index b086c0c650a..745e64e018f 100644 --- a/Master/tlpkg/tlpsrc/texdiff.tlpsrc +++ b/Master/tlpkg/tlpsrc/texdiff.tlpsrc @@ -1,2 +1,2 @@ binpattern f bin/${ARCH}/${PKGNAME} -docpattern +f texmf/doc/man/man1/${PKGNAME}.* +docpattern +f texmf-dist/doc/man/man1/${PKGNAME}.* diff --git a/Master/tlpkg/tlpsrc/texdirflatten.tlpsrc b/Master/tlpkg/tlpsrc/texdirflatten.tlpsrc index 5ba0569a641..98052766046 100644 --- a/Master/tlpkg/tlpsrc/texdirflatten.tlpsrc +++ b/Master/tlpkg/tlpsrc/texdirflatten.tlpsrc @@ -1,2 +1,2 @@ binpattern f bin/${ARCH}/${PKGNAME} -docpattern f texmf/doc/man/man1/${PKGNAME}.* +docpattern f texmf-dist/doc/man/man1/${PKGNAME}.* diff --git a/Master/tlpkg/tlpsrc/texdoc.tlpsrc b/Master/tlpkg/tlpsrc/texdoc.tlpsrc index df98dd9a79a..cdc6efee73f 100644 --- a/Master/tlpkg/tlpsrc/texdoc.tlpsrc +++ b/Master/tlpkg/tlpsrc/texdoc.tlpsrc @@ -6,8 +6,8 @@ runpattern f texmf-dist/scripts/tetex/texdoctk.pl runpattern f texmf-dist/scripts/texdoc/* runpattern f texmf-dist/texdoctk/* runpattern f texmf-dist/texdoc/* -docpattern f texmf/doc/man/man1/texdoc.* -docpattern f texmf/doc/man/man1/texdoctk.* +docpattern f texmf-dist/doc/man/man1/texdoc.* +docpattern f texmf-dist/doc/man/man1/texdoctk.* docpattern f texmf-dist/doc/texdoc/* binpattern f bin/${ARCH}/texdoc binpattern f bin/${ARCH}/texdoctk diff --git a/Master/tlpkg/tlpsrc/texdraw.tlpsrc b/Master/tlpkg/tlpsrc/texdraw.tlpsrc index 1c4f6ab4fe4..a6bfd68c8db 100644 --- a/Master/tlpkg/tlpsrc/texdraw.tlpsrc +++ b/Master/tlpkg/tlpsrc/texdraw.tlpsrc @@ -1 +1 @@ -docpattern +f texmf/doc/info/texdraw.info +docpattern +f texmf-dist/doc/info/texdraw.info diff --git a/Master/tlpkg/tlpsrc/texlive-common.tlpsrc b/Master/tlpkg/tlpsrc/texlive-common.tlpsrc index 7f268b5910a..b96347bebd0 100644 --- a/Master/tlpkg/tlpsrc/texlive-common.tlpsrc +++ b/Master/tlpkg/tlpsrc/texlive-common.tlpsrc @@ -1,7 +1,7 @@ category TLCore shortdesc TeX Live documentation (common elements) # -docpattern +f texmf/doc/texlive/index.html +docpattern +f texmf-dist/doc/texlive/index.html # postaction shortcut type=menu name="TeX Live documentation" \ - cmd=TEXDIR/texmf/doc/texlive/index.html + cmd=TEXDIR/texmf-dist/doc/texlive/index.html diff --git a/Master/tlpkg/tlpsrc/texlive-docindex.tlpsrc b/Master/tlpkg/tlpsrc/texlive-docindex.tlpsrc index 39e3c31a2c0..2a6942dfd7f 100644 --- a/Master/tlpkg/tlpsrc/texlive-docindex.tlpsrc +++ b/Master/tlpkg/tlpsrc/texlive-docindex.tlpsrc @@ -7,4 +7,4 @@ longdesc script for the process. docpattern f doc.html # # tlmgr uses this file, so make it a runtime file rather than doc. -runpattern f texmf/scripts/texlive/var/texcatalogue.keywords +runpattern f texmf-dist/scripts/texlive/var/texcatalogue.keywords diff --git a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc index 6affe3d7d5e..060dc4566c5 100644 --- a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc +++ b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc @@ -5,10 +5,10 @@ longdesc tlmgr to run but still ours. Not included in tlcritical. # depend texlive.infra # -runpattern d texmf/scripts/texlive/lua -runpattern f texmf/scripts/texlive/rungs.tlu -runpattern f texmf/scripts/texlive/test-tlpdb.tlu -runpattern f texmf/scripts/texlive/texconf.tlu +runpattern d texmf-dist/scripts/texlive/lua +runpattern f texmf-dist/scripts/texlive/rungs.tlu +runpattern f texmf-dist/scripts/texlive/test-tlpdb.tlu +runpattern f texmf-dist/scripts/texlive/texconf.tlu # binpattern f bin/${ARCH}/rungs binpattern f bin/${ARCH}/man @@ -19,7 +19,7 @@ runpattern f tlpkg/installer/install-menu-*.pl runpattern f tlpkg/installer/ctan-mirrors.pl binpattern f/win32 install-tl.bat binpattern f/win32 install-tl-advanced.bat -docpattern f texmf/doc/man/man1/install-tl.* +docpattern f texmf-dist/doc/man/man1/install-tl.* # # runscript and tl-tray-menu binpattern f/win32 bin/win32/runscript.* diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc index f42d0b3c758..5f565b54c16 100644 --- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc +++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc @@ -7,8 +7,8 @@ longdesc install packages, and in the tlcritical repository. # docpattern f tlpkg/README docpattern f tlpkg/installer/COPYING.MinGW-runtime.txt -docpattern f texmf/scripts/texlive/NEWS -docpattern f texmf/doc/man/man1/tlmgr.* +docpattern f texmf-dist/scripts/texlive/NEWS +docpattern f texmf-dist/doc/man/man1/tlmgr.* # runpattern d readme-html.dir runpattern d readme-txt.dir @@ -19,12 +19,12 @@ runpattern f README runpattern f README* runpattern f index.html runpattern f release-texlive.txt -runpattern f texmf/scripts/texlive/tlmgr.pl -runpattern f texmf/scripts/texlive/tlmgr.pl -runpattern f texmf/scripts/texlive/tlmgrgui.pl -runpattern f texmf/scripts/texlive/uninstall-win32.pl -runpattern f texmf/web2c/fmtutil-hdr.cnf -runpattern f texmf/web2c/updmap-hdr.cfg +runpattern f texmf-dist/scripts/texlive/tlmgr.pl +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 +runpattern f texmf-dist/web2c/fmtutil-hdr.cnf +runpattern f texmf-dist/web2c/updmap-hdr.cfg runpattern f tlpkg/installer/config.guess # binpattern f bin/${ARCH}/tlmgr diff --git a/Master/tlpkg/tlpsrc/texware.tlpsrc b/Master/tlpkg/tlpsrc/texware.tlpsrc index cc8990f9457..e2027ec5b9f 100644 --- a/Master/tlpkg/tlpsrc/texware.tlpsrc +++ b/Master/tlpkg/tlpsrc/texware.tlpsrc @@ -1,5 +1,5 @@ category TLCore -docpattern f texmf/doc/man/man1/dvitype.* -docpattern f texmf/doc/man/man1/pooltype.* +docpattern f texmf-dist/doc/man/man1/dvitype.* +docpattern f texmf-dist/doc/man/man1/pooltype.* binpattern f bin/${ARCH}/dvitype binpattern f bin/${ARCH}/pooltype diff --git a/Master/tlpkg/tlpsrc/thumbpdf.tlpsrc b/Master/tlpkg/tlpsrc/thumbpdf.tlpsrc index b086c0c650a..745e64e018f 100644 --- a/Master/tlpkg/tlpsrc/thumbpdf.tlpsrc +++ b/Master/tlpkg/tlpsrc/thumbpdf.tlpsrc @@ -1,2 +1,2 @@ binpattern f bin/${ARCH}/${PKGNAME} -docpattern +f texmf/doc/man/man1/${PKGNAME}.* +docpattern +f texmf-dist/doc/man/man1/${PKGNAME}.* diff --git a/Master/tlpkg/tlpsrc/tie.tlpsrc b/Master/tlpkg/tlpsrc/tie.tlpsrc index 8d9f9d86b72..ddeff6e7d8c 100644 --- a/Master/tlpkg/tlpsrc/tie.tlpsrc +++ b/Master/tlpkg/tlpsrc/tie.tlpsrc @@ -1,4 +1,4 @@ category TLCore depend kpathsea -docpattern f texmf/doc/man/man1/tie.* +docpattern f texmf-dist/doc/man/man1/tie.* binpattern f bin/${ARCH}/tie diff --git a/Master/tlpkg/tlpsrc/tlgs.win32.tlpsrc b/Master/tlpkg/tlpsrc/tlgs.win32.tlpsrc index 88c0cde688e..f590ede51b3 100644 --- a/Master/tlpkg/tlpsrc/tlgs.win32.tlpsrc +++ b/Master/tlpkg/tlpsrc/tlgs.win32.tlpsrc @@ -1,7 +1,7 @@ category TLCore catalogue ghostscript binpattern d/win32 tlpkg/tlgs -binpattern d/win32 texmf/scripts/tlgs +binpattern d/win32 texmf-dist/scripts/tlgs binpattern f/win32 bin/win32/eps2eps binpattern f/win32 bin/win32/pdf2dsc binpattern f/win32 bin/win32/pdfopt diff --git a/Master/tlpkg/tlpsrc/tpic2pdftex.tlpsrc b/Master/tlpkg/tlpsrc/tpic2pdftex.tlpsrc index 39c29eb9c50..e54ff6498a2 100644 --- a/Master/tlpkg/tlpsrc/tpic2pdftex.tlpsrc +++ b/Master/tlpkg/tlpsrc/tpic2pdftex.tlpsrc @@ -1,4 +1,4 @@ category TLCore -docpattern f texmf/doc/${PKGNAME}/* -docpattern f texmf/doc/man/man1/${PKGNAME}.* +docpattern f texmf-dist/doc/${PKGNAME}/* +docpattern f texmf-dist/doc/man/man1/${PKGNAME}.* binpattern f bin/${ARCH}/${PKGNAME} diff --git a/Master/tlpkg/tlpsrc/ttfutils.tlpsrc b/Master/tlpkg/tlpsrc/ttfutils.tlpsrc index 1340f801f96..d892e21629d 100644 --- a/Master/tlpkg/tlpsrc/ttfutils.tlpsrc +++ b/Master/tlpkg/tlpsrc/ttfutils.tlpsrc @@ -1,13 +1,13 @@ category TLCore -runpattern d texmf/fonts/enc/ttf2pk/base +runpattern d texmf-dist/fonts/enc/ttf2pk/base runpattern d texmf-dist/fonts/sfd/ttf2pk -runpattern d texmf/ttf2pk +runpattern d texmf-dist/ttf2pk # -docpattern f texmf/doc/man/man1/ttf2afm.* -docpattern f texmf/doc/man/man1/ttf2pk.* -docpattern f texmf/doc/man/man1/ttf2tfm.* -docpattern f texmf/doc/man/man1/ttfdump.* -docpattern d texmf/doc/ttf2pk +docpattern f texmf-dist/doc/man/man1/ttf2afm.* +docpattern f texmf-dist/doc/man/man1/ttf2pk.* +docpattern f texmf-dist/doc/man/man1/ttf2tfm.* +docpattern f texmf-dist/doc/man/man1/ttfdump.* +docpattern d texmf-dist/doc/ttf2pk # binpattern f bin/${ARCH}/ttf2afm binpattern f bin/${ARCH}/ttf2pk diff --git a/Master/tlpkg/tlpsrc/vlna.tlpsrc b/Master/tlpkg/tlpsrc/vlna.tlpsrc index e14eda3bab6..e8834333de8 100644 --- a/Master/tlpkg/tlpsrc/vlna.tlpsrc +++ b/Master/tlpkg/tlpsrc/vlna.tlpsrc @@ -1,4 +1,4 @@ category TLCore -docpattern f texmf/doc/vlna/* -docpattern f texmf/doc/man/man1/vlna.* +docpattern f texmf-dist/doc/vlna/* +docpattern f texmf-dist/doc/man/man1/vlna.* binpattern f bin/${ARCH}/vlna diff --git a/Master/tlpkg/tlpsrc/web.tlpsrc b/Master/tlpkg/tlpsrc/web.tlpsrc index 9bee93e6c2b..0b68830543e 100644 --- a/Master/tlpkg/tlpsrc/web.tlpsrc +++ b/Master/tlpkg/tlpsrc/web.tlpsrc @@ -1,7 +1,7 @@ category TLCore shortdesc original web programs tangle and weave depend kpathsea -docpattern f texmf/doc/man/man1/tangle.* -docpattern f texmf/doc/man/man1/weave.* +docpattern f texmf-dist/doc/man/man1/tangle.* +docpattern f texmf-dist/doc/man/man1/weave.* binpattern f bin/${ARCH}/tangle binpattern f bin/${ARCH}/weave diff --git a/Master/tlpkg/tlpsrc/wintools.win32.tlpsrc b/Master/tlpkg/tlpsrc/wintools.win32.tlpsrc index 137ea6769e9..c6d9d1a71c7 100644 --- a/Master/tlpkg/tlpsrc/wintools.win32.tlpsrc +++ b/Master/tlpkg/tlpsrc/wintools.win32.tlpsrc @@ -30,12 +30,12 @@ binpattern f bin/win32/unzip.exe binpattern f bin/win32/zip.exe binpattern f/win32 tlpkg/sam2p/sam2p.exe # -docpattern d texmf/doc/gzip +docpattern d texmf-dist/doc/gzip # # bitmap2eps is from Siep. # binpattern f/win32 bin/win32/bitmap2eps.exe -runpattern f texmf/scripts/bitmap2eps/bitmap2eps.vbs +runpattern f texmf-dist/scripts/bitmap2eps/bitmap2eps.vbs postaction filetype name="TL.bitmap2eps.convert" \ cmd='"TEXDIR/bin/win32/bitmap2eps.exe" "%1"' diff --git a/Master/tlpkg/tlpsrc/xdvi.tlpsrc b/Master/tlpkg/tlpsrc/xdvi.tlpsrc index 6c793e9643b..044ab61b3ab 100644 --- a/Master/tlpkg/tlpsrc/xdvi.tlpsrc +++ b/Master/tlpkg/tlpsrc/xdvi.tlpsrc @@ -2,7 +2,7 @@ category TLCore binpattern f bin/${ARCH}/xdvi binpattern f bin/${ARCH}/xdvi-* # -runpattern d texmf/xdvi -runpattern d texmf/xdvi/pixmap +runpattern d texmf-dist/xdvi +runpattern d texmf-dist/xdvi/pixmap # -docpattern f texmf/doc/man/man1/xdvi.* +docpattern f texmf-dist/doc/man/man1/xdvi.* diff --git a/Master/tlpkg/tlpsrc/xindy.tlpsrc b/Master/tlpkg/tlpsrc/xindy.tlpsrc index a133bcf9bb0..bf48045917a 100644 --- a/Master/tlpkg/tlpsrc/xindy.tlpsrc +++ b/Master/tlpkg/tlpsrc/xindy.tlpsrc @@ -1,7 +1,7 @@ category TLCore # -runpattern d texmf/xindy -runpattern d texmf/scripts/xindy +runpattern d texmf-dist/xindy +runpattern d texmf-dist/scripts/xindy # # Not all platforms provide this. binpattern f/!mipsel-linux bin/${ARCH}/texindy @@ -18,5 +18,5 @@ binpattern f/!mipsel-linux,universal-darwin \ binpattern f/universal-darwin bin/universal-darwin/xindy-i386.mem binpattern f/universal-darwin bin/universal-darwin/xindy-ppc.mem # -docpattern f texmf/doc/man/man1/*xindy.* -docpattern d texmf/doc/xindy +docpattern f texmf-dist/doc/man/man1/*xindy.* +docpattern d texmf-dist/doc/xindy |