build jadetex using latex.ltx instead of &latex, to appease debian #427562

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

7 files changed, 32 insertions, 14 deletions

diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index d6d624b1836..3da62f00833 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,12 @@
+2009-06-15  Karl Berry  <karl@tug.org>
+
+	* texmf.cnf (TEXINPUTS.jadetex,pdfjadetex): search latex, not plain.
+	Thus we find the latex fonttext.cfg before cslatex's, and thus
+	we can build the format using latex.ltx, and thus
+	we can avoid & in fmtutil.cnf, and thus
+	we can avoid painful infinite loops on failure, or something.
+	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=427562
+
 2009-06-10  Karl Berry  <karl@tug.org>
 
 	* ac/web2c.ac (mktexfmt): default to yes.
diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf
index 31a06f3fba9..25c6953aaa6 100644
--- a/Build/source/texk/kpathsea/texmf.cnf
+++ b/Build/source/texk/kpathsea/texmf.cnf
@@ -174,7 +174,6 @@ TEXINPUTS.amstex        = .;$TEXMF/tex/{amstex,plain,generic,}//
 TEXINPUTS.csplain       = .;$TEXMF/tex/{csplain,plain,generic,}//
 TEXINPUTS.eplain        = .;$TEXMF/tex/{eplain,plain,generic,}//
 TEXINPUTS.ftex          = .;$TEXMF/tex/{formate,plain,generic,}//
-TEXINPUTS.jadetex       = .;$TEXMF/tex/{jadetex,plain,generic,}//
 TEXINPUTS.mex           = .;$TEXMF/tex/{mex,plain,generic,}//
 TEXINPUTS.texinfo       = .;$TEXMF/tex/{texinfo,plain,generic,}//
 
@@ -200,7 +199,6 @@ TEXINPUTS.etex          = .;$TEXMF/tex/{plain,generic,}//
 % pdfTeX.
 TEXINPUTS.pdfcslatex    = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
 TEXINPUTS.pdfcsplain    = .;$TEXMF/tex/{csplain,plain,generic,}//
-TEXINPUTS.pdfjadetex    = .;$TEXMF/tex/{jadetex,plain,generic,}//
 TEXINPUTS.pdflatex      = .;$TEXMF/tex/{latex,generic,}//
 TEXINPUTS.pdfmex        = .;$TEXMF/tex/{mex,plain,generic,}//
 TEXINPUTS.utf8mex       = .;$TEXMF/tex/{mex,plain,generic,}//
@@ -239,6 +237,10 @@ TEXINPUTS.omega         = .;$TEXMF/tex/{plain,generic,}//
 % ConTeXt.
 TEXINPUTS.context       = .;$TEXMF/tex/{context,plain,generic,}//
 
+% jadetex
+TEXINPUTS.jadetex       = .;$TEXMF/tex/{jadetex,latex,generic,}//
+TEXINPUTS.pdfjadetex    = .;$TEXMF/tex/{jadetex,latex,generic,}//
+
 % XMLTeX.
 TEXINPUTS.xmltex        = .;$TEXMF/tex/{xmltex,latex,generic,}//
 TEXINPUTS.pdfxmltex     = .;$TEXMF/tex/{xmltex,latex,generic,}//
diff --git a/Master/texmf-dist/tex/jadetex/base/jadetex.ini b/Master/texmf-dist/tex/jadetex/base/jadetex.ini
index e4bc23060cf..bcf416a0d03 100644
--- a/Master/texmf-dist/tex/jadetex/base/jadetex.ini
+++ b/Master/texmf-dist/tex/jadetex/base/jadetex.ini
@@ -1,3 +1,8 @@
+% public domain.
+\let\primitivedump=\dump
+\let\dump=\relax
+\input latex.ini
+\let\dump=\primitivedump
+
 \input jadetex.ltx
 \dump
-\endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/jadetex/base/pdfjadetex.ini b/Master/texmf-dist/tex/jadetex/base/pdfjadetex.ini
index 7af5fcb3b4c..73cd43917cd 100644
--- a/Master/texmf-dist/tex/jadetex/base/pdfjadetex.ini
+++ b/Master/texmf-dist/tex/jadetex/base/pdfjadetex.ini
@@ -1,4 +1,4 @@
+% public domain
 \input pdftexconfig.tex
-\input jadetex.ltx
-\dump
-\endinput
+\input jadetex.ini
+
diff --git a/Master/texmf/web2c/fmtutil.cnf b/Master/texmf/web2c/fmtutil.cnf
index d636a56b8ab..3af134a4d1f 100644
--- a/Master/texmf/web2c/fmtutil.cnf
+++ b/Master/texmf/web2c/fmtutil.cnf
@@ -64,8 +64,8 @@ pdfcsplain pdftex - -etex -translate-file=cp227.tcx csplain.ini
 eplain pdftex - -translate-file=cp227.tcx *eplain.ini
 #
 # from jadetex:
-jadetex pdftex language.dat &latex jadetex.ini
-pdfjadetex pdftex language.dat &pdflatex pdfjadetex.ini
+jadetex pdftex language.dat *jadetex.ini
+pdfjadetex pdftex language.dat *pdfjadetex.ini
 #
 # from latex:
 latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
diff --git a/Master/texmf/web2c/texmf.cnf b/Master/texmf/web2c/texmf.cnf
index 31a06f3fba9..25c6953aaa6 100644
--- a/Master/texmf/web2c/texmf.cnf
+++ b/Master/texmf/web2c/texmf.cnf
@@ -174,7 +174,6 @@ TEXINPUTS.amstex        = .;$TEXMF/tex/{amstex,plain,generic,}//
 TEXINPUTS.csplain       = .;$TEXMF/tex/{csplain,plain,generic,}//
 TEXINPUTS.eplain        = .;$TEXMF/tex/{eplain,plain,generic,}//
 TEXINPUTS.ftex          = .;$TEXMF/tex/{formate,plain,generic,}//
-TEXINPUTS.jadetex       = .;$TEXMF/tex/{jadetex,plain,generic,}//
 TEXINPUTS.mex           = .;$TEXMF/tex/{mex,plain,generic,}//
 TEXINPUTS.texinfo       = .;$TEXMF/tex/{texinfo,plain,generic,}//
 
@@ -200,7 +199,6 @@ TEXINPUTS.etex          = .;$TEXMF/tex/{plain,generic,}//
 % pdfTeX.
 TEXINPUTS.pdfcslatex    = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
 TEXINPUTS.pdfcsplain    = .;$TEXMF/tex/{csplain,plain,generic,}//
-TEXINPUTS.pdfjadetex    = .;$TEXMF/tex/{jadetex,plain,generic,}//
 TEXINPUTS.pdflatex      = .;$TEXMF/tex/{latex,generic,}//
 TEXINPUTS.pdfmex        = .;$TEXMF/tex/{mex,plain,generic,}//
 TEXINPUTS.utf8mex       = .;$TEXMF/tex/{mex,plain,generic,}//
@@ -239,6 +237,10 @@ TEXINPUTS.omega         = .;$TEXMF/tex/{plain,generic,}//
 % ConTeXt.
 TEXINPUTS.context       = .;$TEXMF/tex/{context,plain,generic,}//
 
+% jadetex
+TEXINPUTS.jadetex       = .;$TEXMF/tex/{jadetex,latex,generic,}//
+TEXINPUTS.pdfjadetex    = .;$TEXMF/tex/{jadetex,latex,generic,}//
+
 % XMLTeX.
 TEXINPUTS.xmltex        = .;$TEXMF/tex/{xmltex,latex,generic,}//
 TEXINPUTS.pdfxmltex     = .;$TEXMF/tex/{xmltex,latex,generic,}//
diff --git a/Master/tlpkg/tlpsrc/jadetex.tlpsrc b/Master/tlpkg/tlpsrc/jadetex.tlpsrc
index 84bec76b08d..abd307b482d 100644
--- a/Master/tlpkg/tlpsrc/jadetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/jadetex.tlpsrc
@@ -1,8 +1,8 @@
-name jadetex
-category Package
 depend pdftex
 depend tex
-execute AddFormat name=jadetex engine=pdftex patterns=language.dat options="&latex jadetex.ini"
-execute AddFormat name=pdfjadetex engine=pdftex patterns=language.dat options="&pdflatex pdfjadetex.ini"
+execute AddFormat name=jadetex engine=pdftex patterns=language.dat \
+        options="*jadetex.ini" 
+execute AddFormat name=pdfjadetex engine=pdftex patterns=language.dat \
+        options="*pdfjadetex.ini"
 binpattern f bin/${ARCH}/jadetex
 binpattern f bin/${ARCH}/pdfjadetex