[subversion-commit] SVN tetex commit + diffs: r457 - in tex-common/trunk: conf/texmf.d debian

[Frank Küster]

Author: frank
Date: 2006-01-13 11:49:26 +0000 (Fri, 13 Jan 2006)
New Revision: 457

Modified:
   tex-common/trunk/conf/texmf.d/55Fonts.cnf
   tex-common/trunk/debian/changelog
   tex-common/trunk/debian/postinst.in
Log:
* Drop unneeded paths from TEXFONTMAPS, we now have only 3.0's upstream
  value plus our backward-compatibility paths; also change the check in
  the postinst accordingly (although the old one would still work, we do
  not allow it for simplicity's sake).


Modified: tex-common/trunk/conf/texmf.d/55Fonts.cnf
===================================================================
--- tex-common/trunk/conf/texmf.d/55Fonts.cnf	2006-01-13 11:49:05 UTC (rev 456)
+++ tex-common/trunk/conf/texmf.d/55Fonts.cnf	2006-01-13 11:49:26 UTC (rev 457)
@@ -21,7 +21,7 @@
 % font name map files.
 % TEXFONTMAPS = .;$TEXMF/{fonts/map,}/{$progname,pdftex,dvips,}//
 % temporarily add the old path
-TEXFONTMAPS = .;$TEXMF/{fonts/map,}/{$progname,pdftex,dvips,}//;$TEXMF/dvips//
+TEXFONTMAPS = .;$TEXMF/{fonts/,}map//;$TEXMF/dvips//
 
 % support non"k"-xdvi:
 PKFONTS.XDvi    = .:$TEXMF/%s:$VARTEXFONTS/pk/{%m,modeless}//

Modified: tex-common/trunk/debian/changelog
===================================================================
--- tex-common/trunk/debian/changelog	2006-01-13 11:49:05 UTC (rev 456)
+++ tex-common/trunk/debian/changelog	2006-01-13 11:49:26 UTC (rev 457)
@@ -5,8 +5,12 @@
   * Add more checks for essential entries in texmf.cnf, and bail out with
     a user-friendly error message if they are missing (closes: #346326)
     [frank] 
+  * Drop unneeded paths from TEXFONTMAPS, we now have only 3.0's upstream
+    value plus our backward-compatibility paths; also change the check in
+    the postinst accordingly (although the old one would still work, we do
+    not allow it for simplicity's sake).
 
- -- Frank Küster <frank at debian.org>  Tue, 10 Jan 2006 10:59:10 +0100
+ -- Frank Küster <frank at debian.org>  Fri, 13 Jan 2006 12:48:41 +0100
 
 tex-common (0.14) unstable; urgency=low
 

Modified: tex-common/trunk/debian/postinst.in
===================================================================
--- tex-common/trunk/debian/postinst.in	2006-01-13 11:49:05 UTC (rev 456)
+++ tex-common/trunk/debian/postinst.in	2006-01-13 11:49:26 UTC (rev 457)
@@ -92,8 +92,8 @@
     fi
 
 # Now we check for some essential settings
-    check_texmf /etc/texmf/texmf.d/55Fonts.cnf TEXFONTMAPS "{fonts/map,}/{\$progname,pdftex,dvips,}//"
-    check_texmf /etc/texmf/texmf.cnf TEXFONTMAPS "{fonts/map,}/{\$progname,pdftex,dvips,}//"
+    check_texmf /etc/texmf/texmf.d/55Fonts.cnf TEXFONTMAPS "$TEXMF/{fonts/,}map//;$TEXMF/dvips////"
+    check_texmf /etc/texmf/texmf.cnf TEXFONTMAPS "$TEXMF/{fonts/,}map//;$TEXMF/dvips////"
     check_texmf /etc/texmf/texmf.d/05TeXMF.cnf TEXMFMAIN "/usr/share/texmf"
     check_texmf /etc/texmf/texmf.cnf TEXMFMAIN "/usr/share/texmf"
     check_texmf /etc/texmf/texmf.d/05TeXMF.cnf TEXMFDIST \