[Debian-tex-commits] SVN tex-common commit + diffs: r1905 - tex-common/trunk/debian

Frank Küster frank at costa.debian.org
Wed Oct 25 12:51:55 UTC 2006


Author: frank
Date: 2006-10-25 12:51:55 +0000 (Wed, 25 Oct 2006)
New Revision: 1905

Modified:
   tex-common/trunk/debian/postinst.functions
   tex-common/trunk/debian/postinst.in
Log:
adjust tests


Modified: tex-common/trunk/debian/postinst.functions
===================================================================
--- tex-common/trunk/debian/postinst.functions	2006-10-25 11:52:47 UTC (rev 1904)
+++ tex-common/trunk/debian/postinst.functions	2006-10-25 12:51:55 UTC (rev 1905)
@@ -52,21 +52,6 @@
       echo "Error in $file: $variable incorrectly defined." >&2
       checkfailed=true
     fi
-    if [ "$variable" = TEXFONTMAPS ]; then
-    # the following is for backwards compatibility; must be dropped once all 
-    # font packages follow TDS 1.1
-      if ! echo "$line" | grep -q '/dvips//'; then
-	variable=${variable%$removepattern}
-	db_subst tex-common/check_texmf_wrong filename $file || true
-	db_subst tex-common/check_texmf_wrong variable $variable || true
-	db_subst tex-common/check_texmf_wrong pattern "/dvips//" || true
-	db_fset tex-common/check_texmf_wrong seen false || true
-	db_input critical tex-common/check_texmf_wrong || true
-	echo "Error in $file: $variable incorrectly defined." >&2
-	db_go || true
-	checkfailed=true
-      fi
-    fi
   fi
 }
 

Modified: tex-common/trunk/debian/postinst.in
===================================================================
--- tex-common/trunk/debian/postinst.in	2006-10-25 11:52:47 UTC (rev 1904)
+++ tex-common/trunk/debian/postinst.in	2006-10-25 12:51:55 UTC (rev 1905)
@@ -124,8 +124,10 @@
     update-texmf
 # Now we check for some essential settings
     checkfailed=false
-    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/55Fonts.cnf TEXFONTMAPS \
+'\$TEXMF/{fonts/,}map//;\$TEXMF/dvips//|\.;\$TEXMF{/fonts/map,}{/\$progname,/pdftex,/dvips,}//'
+    check_texmf /etc/texmf/texmf.cnf TEXFONTMAPS \
+'\$TEXMF/{fonts/,}map//;\$TEXMF/dvips//|\.;\$TEXMF{/fonts/map,}{/\$progname,/pdftex,/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 \




More information about the Debian-tex-commits mailing list