[subversion-commit] SVN tetex-bin commit + diffs: r981 - in tetex-bin/trunk/debian: . patches

[Frank Küster]

Author: frank
Date: 2006-03-02 11:36:19 +0000 (Thu, 02 Mar 2006)
New Revision: 981

Modified:
   tetex-bin/trunk/debian/changelog
   tetex-bin/trunk/debian/patches/patch-tmp
Log:
* Add the temporary directory to TEXFORMATS in fmtutil, to allow
  building formats based on latex.fmt without cluttering stdout (closes:
  #354604) [frank]


Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog	2006-03-02 10:57:59 UTC (rev 980)
+++ tetex-bin/trunk/debian/changelog	2006-03-02 11:36:19 UTC (rev 981)
@@ -7,8 +7,15 @@
   * Convert README.Debian to the DebianDoc-SGML format; install the text
     and HTML versions; register them with doc-base. [florent]
   * add the magic header to fmt.d/01tetex.cnf (Closes: #354375) [preining]
+  * Add the temporary directory to TEXFORMATS in fmtutil, to allow
+    building formats based on latex.fmt without cluttering stdout (closes:
+    #354604) [frank]
 
+<<<<<<< .mine
+ -- Frank Küster <frank at debian.org>  Thu,  2 Mar 2006 12:36:23 +0100
+=======
  -- Norbert Preining <preining at logic.at>  Sat, 25 Feb 2006 19:34:13 +0100
+>>>>>>> .r980
 
 tetex-bin (3.0-14) unstable; urgency=low
 

Modified: tetex-bin/trunk/debian/patches/patch-tmp
===================================================================
--- tetex-bin/trunk/debian/patches/patch-tmp	2006-03-02 10:57:59 UTC (rev 980)
+++ tetex-bin/trunk/debian/patches/patch-tmp	2006-03-02 11:36:19 UTC (rev 981)
@@ -6,8 +6,8 @@
 
 Index: tetex-bin-3.0/texk/tetex/epstopdf
 ===================================================================
---- tetex-bin-3.0.orig/texk/tetex/epstopdf	2005-10-06 15:03:59.875239843 +0200
-+++ tetex-bin-3.0/texk/tetex/epstopdf	2005-10-06 15:04:11.255019798 +0200
+--- tetex-bin-3.0.orig/texk/tetex/epstopdf	2006-03-02 11:54:40.000000000 +0100
++++ tetex-bin-3.0/texk/tetex/epstopdf	2006-03-02 11:54:43.000000000 +0100
 @@ -205,7 +205,8 @@
  ### open output file
  if ($::opt_gs) {
@@ -20,8 +20,8 @@
  }
 Index: tetex-bin-3.0/texk/tetex/epstopdf.man
 ===================================================================
---- tetex-bin-3.0.orig/texk/tetex/epstopdf.man	2005-10-06 15:03:59.875239843 +0200
-+++ tetex-bin-3.0/texk/tetex/epstopdf.man	2005-10-06 15:04:11.255019798 +0200
+--- tetex-bin-3.0.orig/texk/tetex/epstopdf.man	2006-03-02 11:54:40.000000000 +0100
++++ tetex-bin-3.0/texk/tetex/epstopdf.man	2006-03-02 11:54:43.000000000 +0100
 @@ -14,10 +14,12 @@
  .P
  If the bounding box is not right, of course, you have problems...
@@ -40,8 +40,8 @@
  .IP "\fB--\fP[\fBno\fP]\fBcompress\fP"
 Index: tetex-bin-3.0/texk/dvipdfm/ebb.c
 ===================================================================
---- tetex-bin-3.0.orig/texk/dvipdfm/ebb.c	2005-10-06 15:03:59.875239843 +0200
-+++ tetex-bin-3.0/texk/dvipdfm/ebb.c	2005-10-06 15:04:11.256019691 +0200
+--- tetex-bin-3.0.orig/texk/dvipdfm/ebb.c	2006-03-02 11:54:40.000000000 +0100
++++ tetex-bin-3.0/texk/dvipdfm/ebb.c	2006-03-02 11:54:43.000000000 +0100
 @@ -49,7 +49,7 @@
    fprintf (stderr, "ebb comes with ABSOLUTELY NO WARRANTY.\n");
    fprintf (stderr, "This is free software, and you are welcome to redistribute it\n");
@@ -53,8 +53,8 @@
    exit(1);
 Index: tetex-bin-3.0/texk/dvipdfm/ebb.1
 ===================================================================
---- tetex-bin-3.0.orig/texk/dvipdfm/ebb.1	2005-10-06 15:03:59.875239843 +0200
-+++ tetex-bin-3.0/texk/dvipdfm/ebb.1	2005-10-06 15:04:11.257019583 +0200
+--- tetex-bin-3.0.orig/texk/dvipdfm/ebb.1	2006-03-02 11:54:43.000000000 +0100
++++ tetex-bin-3.0/texk/dvipdfm/ebb.1	2006-03-02 11:54:43.000000000 +0100
 @@ -18,11 +18,9 @@
  .HP
  \fB\-v\fR : be verbose
@@ -69,3 +69,26 @@
  .PP 
  .SH "AUTHOR" 
  .PP 
+Index: tetex-bin-3.0/texk/tetex/fmtutil
+===================================================================
+--- tetex-bin-3.0.orig/texk/tetex/fmtutil	2006-03-02 11:54:43.000000000 +0100
++++ tetex-bin-3.0/texk/tetex/fmtutil	2006-03-02 11:58:22.000000000 +0100
+@@ -34,6 +34,7 @@
+ ###############################################################################
+ ###############################################################################
+ # program history:
++#   Do Mar 02 10:42:31 CET 2006 add tmpdir to TEXFORMATS (currently Debian specific)
+ #   Sa Jan 15 18:13:46 CET 2005 avoid multiple variable assignments in one statement
+ #   Di Jan 11 11:42:36 CET 2005 fix --byhyphen with relative hyphenfile
+ #   Fr Dez 31 16:51:29 CET 2004 option catcfg added (for being called by texconfig)
+@@ -564,6 +565,10 @@
+   # due to KPSE_DOT, we don't search the current directory, so include
+   # it explicitly for formats that \write and later on \read
+   TEXINPUTS="$tmpdir:$TEXINPUTS"; export TEXINPUTS
++  # for formats that load other formats (e.g. jadetex loads latex.fmt), 
++  # add the current directory to TEXFORMATS, too.  We could do the same for
++  # MFBASES and MPMEMS, but it doesn't seem to be necessary currently.
++  TEXFORMATS="$tmpdir:$TEXFORMATS"; export TEXFORMATS
+ 
+   setupTmpDir
+   cd "$tmpdir" || {