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

Ralf Stubner stubner-guest at costa.debian.org
Thu Jun 1 19:29:03 UTC 2006


Author: stubner-guest
Date: 2006-06-01 19:29:02 +0000 (Thu, 01 Jun 2006)
New Revision: 1404

Modified:
   tetex-bin/trunk/debian/changelog
   tetex-bin/trunk/debian/patches/README.patches
   tetex-bin/trunk/debian/patches/patch-tmp
Log:
add support for nonexistant TEXMFVAR to texk/kpathsea/mktexnam 
(accepted upstream). First step to a new font caching strategy.


Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog	2006-05-31 15:04:56 UTC (rev 1403)
+++ tetex-bin/trunk/debian/changelog	2006-06-01 19:29:02 UTC (rev 1404)
@@ -10,6 +10,8 @@
     Lönngren <bice77 at malmo2.net> (closes: #365979) [frank]
   * Document more clearly that british english hyphenation patterns are
     non-free and cannot be enabled.
+  * Add support for nonexitant TEXMFVAR to texk/kpathsea/mktexnam 
+    (approved upstream). First step for a new font caching. [ralf]
 
  -- Frank Küster <frank at debian.org>  Thu,  4 May 2006 15:51:02 +0200
 

Modified: tetex-bin/trunk/debian/patches/README.patches
===================================================================
--- tetex-bin/trunk/debian/patches/README.patches	2006-05-31 15:04:56 UTC (rev 1403)
+++ tetex-bin/trunk/debian/patches/README.patches	2006-06-01 19:29:02 UTC (rev 1404)
@@ -86,8 +86,12 @@
 
 5. patch-tmp
 ============
-- currently none
 
+texk/kpathsea/mktexnam:
+        add support for nonexistent TEXMFVAR
+
+- purpose of other patches?
+
 6. patch-tds
 ============
 

Modified: tetex-bin/trunk/debian/patches/patch-tmp
===================================================================
--- tetex-bin/trunk/debian/patches/patch-tmp	2006-05-31 15:04:56 UTC (rev 1403)
+++ tetex-bin/trunk/debian/patches/patch-tmp	2006-06-01 19:29:02 UTC (rev 1404)
@@ -8,10 +8,10 @@
  texk/tetex/fmtutil      |    5 +++++
  8 files changed, 27 insertions(+), 14 deletions(-)
 
-Index: tetex-bin-3.0/texk/tetex/epstopdf
+Index: tetex-bin/texk/tetex/epstopdf
 ===================================================================
---- tetex-bin-3.0.orig/texk/tetex/epstopdf	2006-04-27 16:31:52.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/epstopdf	2006-04-27 16:34:59.000000000 +0200
+--- tetex-bin.orig/texk/tetex/epstopdf	2006-01-03 13:49:32.000000000 +0100
++++ tetex-bin/texk/tetex/epstopdf	2006-06-01 21:10:36.299540000 +0200
 @@ -205,7 +205,8 @@
  ### open output file
  if ($::opt_gs) {
@@ -22,10 +22,10 @@
    debug "Ghostscript pipe:", $pipe;
    open(OUT,"|$pipe") or error "Cannot open Ghostscript for piped input";
  }
-Index: tetex-bin-3.0/texk/tetex/epstopdf.man
+Index: tetex-bin/texk/tetex/epstopdf.man
 ===================================================================
---- tetex-bin-3.0.orig/texk/tetex/epstopdf.man	2006-04-27 16:31:52.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/epstopdf.man	2006-04-27 16:34:59.000000000 +0200
+--- tetex-bin.orig/texk/tetex/epstopdf.man	2006-01-03 13:49:32.000000000 +0100
++++ tetex-bin/texk/tetex/epstopdf.man	2006-06-01 21:10:36.299540000 +0200
 @@ -14,10 +14,12 @@
  .P
  If the bounding box is not right, of course, you have problems...
@@ -42,10 +42,10 @@
  .IP "\fB--\fP[\fBno\fP]\fBgs\fP"
  run ghostscript       (default: --gs).
  .IP "\fB--\fP[\fBno\fP]\fBcompress\fP"
-Index: tetex-bin-3.0/texk/dvipdfm/ebb.c
+Index: tetex-bin/texk/dvipdfm/ebb.c
 ===================================================================
---- tetex-bin-3.0.orig/texk/dvipdfm/ebb.c	2006-04-27 16:31:52.000000000 +0200
-+++ tetex-bin-3.0/texk/dvipdfm/ebb.c	2006-04-27 16:34:59.000000000 +0200
+--- tetex-bin.orig/texk/dvipdfm/ebb.c	2006-01-03 13:49:32.000000000 +0100
++++ tetex-bin/texk/dvipdfm/ebb.c	2006-06-01 21:10:36.309540000 +0200
 @@ -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");
@@ -55,10 +55,10 @@
    fprintf (stderr, "\t-b\t\tWrite .bb file in binary mode\n");
    fprintf (stderr, "\t-v\t\tVerbose\n");
    exit(1);
-Index: tetex-bin-3.0/texk/dvipdfm/ebb.1
+Index: tetex-bin/texk/dvipdfm/ebb.1
 ===================================================================
---- tetex-bin-3.0.orig/texk/dvipdfm/ebb.1	2006-04-27 16:34:59.000000000 +0200
-+++ tetex-bin-3.0/texk/dvipdfm/ebb.1	2006-04-27 16:34:59.000000000 +0200
+--- tetex-bin.orig/texk/dvipdfm/ebb.1	2006-06-01 21:10:35.939540000 +0200
++++ tetex-bin/texk/dvipdfm/ebb.1	2006-06-01 21:10:36.309540000 +0200
 @@ -18,11 +18,9 @@
  .HP
  \fB\-v\fR : be verbose
@@ -73,10 +73,10 @@
  .PP 
  .SH "AUTHOR" 
  .PP 
-Index: tetex-bin-3.0/texk/tetex/fmtutil
+Index: tetex-bin/texk/tetex/fmtutil
 ===================================================================
---- tetex-bin-3.0.orig/texk/tetex/fmtutil	2006-04-27 16:34:59.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/fmtutil	2006-04-27 16:34:59.000000000 +0200
+--- tetex-bin.orig/texk/tetex/fmtutil	2006-06-01 21:10:35.429540000 +0200
++++ tetex-bin/texk/tetex/fmtutil	2006-06-01 21:10:36.309540000 +0200
 @@ -34,6 +34,7 @@
  ###############################################################################
  ###############################################################################
@@ -96,10 +96,10 @@
  
    setupTmpDir
    cd "$tmpdir" || {
-Index: tetex-bin-3.0/texk/dvipsk/dvips.texi
+Index: tetex-bin/texk/dvipsk/dvips.texi
 ===================================================================
---- tetex-bin-3.0.orig/texk/dvipsk/dvips.texi	2006-04-27 16:31:52.000000000 +0200
-+++ tetex-bin-3.0/texk/dvipsk/dvips.texi	2006-04-27 16:34:59.000000000 +0200
+--- tetex-bin.orig/texk/dvipsk/dvips.texi	2005-10-06 17:26:11.000000000 +0200
++++ tetex-bin/texk/dvipsk/dvips.texi	2006-06-01 21:10:36.349540000 +0200
 @@ -1073,9 +1073,11 @@
  
  @item -T @var{hsize}, at var{vsize}
@@ -115,10 +115,10 @@
  
  @item -u @var{psmapfile}
  @opindex -u @var{psmapfile}
-Index: tetex-bin-3.0/texk/dvipsk/dvips.info
+Index: tetex-bin/texk/dvipsk/dvips.info
 ===================================================================
---- tetex-bin-3.0.orig/texk/dvipsk/dvips.info	2006-04-27 16:31:52.000000000 +0200
-+++ tetex-bin-3.0/texk/dvipsk/dvips.info	2006-04-27 16:34:59.000000000 +0200
+--- tetex-bin.orig/texk/dvipsk/dvips.info	2005-10-06 17:26:11.000000000 +0200
++++ tetex-bin/texk/dvipsk/dvips.info	2006-06-01 21:10:36.389540000 +0200
 @@ -915,7 +915,9 @@
  `-T HSIZE,VSIZE'
       Set the paper size to (HSIZE,VSIZE), a comma-separated pair of
@@ -130,10 +130,10 @@
  
  `-u PSMAPFILE'
       Set PSMAPFILE to be the file that dvips uses for looking up
-Index: tetex-bin-3.0/texk/dvipsk/dvips.1
+Index: tetex-bin/texk/dvipsk/dvips.1
 ===================================================================
---- tetex-bin-3.0.orig/texk/dvipsk/dvips.1	2006-04-27 16:31:52.000000000 +0200
-+++ tetex-bin-3.0/texk/dvipsk/dvips.1	2006-04-27 16:34:59.000000000 +0200
+--- tetex-bin.orig/texk/dvipsk/dvips.1	2005-10-06 17:26:11.000000000 +0200
++++ tetex-bin/texk/dvipsk/dvips.1	2006-06-01 21:10:36.409540000 +0200
 @@ -422,7 +422,10 @@
  Set the paper size to the given pair of dimensions.  This option takes
  its arguments in the same style as
@@ -146,3 +146,30 @@
  .TP
  .B -u psmapfile
  Set
+Index: tetex-bin/texk/kpathsea/mktexnam
+===================================================================
+--- tetex-bin.orig/texk/kpathsea/mktexnam	2005-10-06 17:26:12.000000000 +0200
++++ tetex-bin/texk/kpathsea/mktexnam	2006-06-01 21:13:09.289540000 +0200
+@@ -145,7 +145,7 @@
+       # Some additional uglyness handles the case where $TEXMFVAR exists
+       # but $TEXMFVAR/fonts doesn't (yet).
+       if test "x$USE_TEXMFVAR" = x1; then
+-        : ${MT_TEXMFVAR=`kpsewhich --expand-path='$TEXMFVAR'`}
++        : ${MT_TEXMFVAR=`kpsewhich --var-value=TEXMFVAR`}
+         MT_DESTROOT=$MT_TEXMFVAR/fonts
+         if test -z "$MT_TEXMFVAR"; then
+           # Path expansion of $TEXMFVAR was empty.
+@@ -158,9 +158,12 @@
+           # De we have write access and permission?
+           kpseaccess -w "$MT_TEXMFVAR" || FALLBACK=1
+           test -w "$MT_TEXMFVAR" || FALLBACK=1
+-        else
++        elif test -e "$MT_TEXMFVAR"; then
+           # TEXMFVAR defined and exists, but it is not a directory?
+           FALLBACK=1
++        else
++          # TEXMFVAR defined but does not exist, try to create it
++          MT_FEATURES=none "$MT_MKTEXDIR" "$MT_TEXMFVAR" || FALLBACK=1
+         fi
+       else
+         # Do we have write access and permission?




More information about the Pkg-tetex-commits mailing list