From 83d6e52b28d61ef00b19820bf8e70f3bea877cb0 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 22 May 2009 10:29:21 +0000 Subject: merge bin-latex into latex, update dependencies git-svn-id: svn://tug.org/texlive/trunk@13377 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/tlpsrc/bin-latex.tlpsrc | 17 ----------------- Master/tlpkg/tlpsrc/collection-latex.tlpsrc | 1 - Master/tlpkg/tlpsrc/cslatex.tlpsrc | 2 +- Master/tlpkg/tlpsrc/latex.tlpsrc | 16 +++++++++++++++- Master/tlpkg/tlpsrc/mltex.tlpsrc | 2 +- 5 files changed, 17 insertions(+), 21 deletions(-) delete mode 100644 Master/tlpkg/tlpsrc/bin-latex.tlpsrc diff --git a/Master/tlpkg/tlpsrc/bin-latex.tlpsrc b/Master/tlpkg/tlpsrc/bin-latex.tlpsrc deleted file mode 100644 index b24dd2eef59..00000000000 --- a/Master/tlpkg/tlpsrc/bin-latex.tlpsrc +++ /dev/null @@ -1,17 +0,0 @@ -name bin-latex -category TLCore -depend luatex -depend pdftex -depend latexconfig -depend latex-fonts -execute AddFormat name=latex engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *latex.ini" -execute AddFormat name=pdflatex engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *pdflatex.ini" -execute AddFormat name=lualatex engine=luatex patterns=language.dat options="lualatex.ini" -execute AddFormat name=pdflualatex engine=luatex patterns=language.dat options="pdflualatex.ini" -binpattern f bin/${ARCH}/latex -binpattern f/!hppa-hpux bin/${ARCH}/lualatex -binpattern f bin/${ARCH}/pdflatex -binpattern f/!hppa-hpux bin/${ARCH}/pdflualatex -docpattern f texmf/doc/man/man1/latex.* -docpattern f texmf/doc/man/man1/pdflatex.* -runpattern d texmf/tex/latex/config diff --git a/Master/tlpkg/tlpsrc/collection-latex.tlpsrc b/Master/tlpkg/tlpsrc/collection-latex.tlpsrc index 8adcadb3896..9725e7bc28b 100644 --- a/Master/tlpkg/tlpsrc/collection-latex.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-latex.tlpsrc @@ -27,5 +27,4 @@ depend pslatex depend psnfss depend pspicture depend tools -depend bin-latex depend collection-basic diff --git a/Master/tlpkg/tlpsrc/cslatex.tlpsrc b/Master/tlpkg/tlpsrc/cslatex.tlpsrc index 35dcf3bbeae..c131fbc57e8 100644 --- a/Master/tlpkg/tlpsrc/cslatex.tlpsrc +++ b/Master/tlpkg/tlpsrc/cslatex.tlpsrc @@ -1,6 +1,6 @@ name cslatex category Package -depend bin-latex +depend latex execute AddFormat name=cslatex engine=pdftex options="-etex -translate-file=cp227.tcx cslatex.ini" execute AddFormat name=pdfcslatex engine=pdftex options="-etex -translate-file=cp227.tcx cslatex.ini" binpattern f bin/${ARCH}/cslatex diff --git a/Master/tlpkg/tlpsrc/latex.tlpsrc b/Master/tlpkg/tlpsrc/latex.tlpsrc index ebbd72d82c5..1141c8c8fc4 100644 --- a/Master/tlpkg/tlpsrc/latex.tlpsrc +++ b/Master/tlpkg/tlpsrc/latex.tlpsrc @@ -1,7 +1,21 @@ name latex category Package -depend bin-latex +depend luatex +depend pdftex +depend latexconfig +depend latex-fonts +execute AddFormat name=latex engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *latex.ini" +execute AddFormat name=pdflatex engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *pdflatex.ini" +execute AddFormat name=lualatex engine=luatex patterns=language.dat options="lualatex.ini" +execute AddFormat name=pdflualatex engine=luatex patterns=language.dat options="pdflualatex.ini" srcpattern d texmf-dist/source/latex/base runpattern d texmf-dist/makeindex/latex runpattern d texmf-dist/tex/latex/base +runpattern d texmf/tex/latex/config docpattern d texmf-dist/doc/latex/base +docpattern f texmf/doc/man/man1/latex.* +docpattern f texmf/doc/man/man1/pdflatex.* +binpattern f bin/${ARCH}/latex +binpattern f/!hppa-hpux bin/${ARCH}/lualatex +binpattern f bin/${ARCH}/pdflatex +binpattern f/!hppa-hpux bin/${ARCH}/pdflualatex diff --git a/Master/tlpkg/tlpsrc/mltex.tlpsrc b/Master/tlpkg/tlpsrc/mltex.tlpsrc index 83ee569fb2f..f1094cbade5 100644 --- a/Master/tlpkg/tlpsrc/mltex.tlpsrc +++ b/Master/tlpkg/tlpsrc/mltex.tlpsrc @@ -1,6 +1,6 @@ name mltex category Package -depend bin-latex +depend latex execute AddFormat name=mltex engine=pdftex options="-translate-file=cp227.tcx -mltex mltex.ini" execute AddFormat name=mllatex engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx -mltex mllatex.ini" binpattern f bin/${ARCH}/mllatex -- cgit v1.2.3