[subversion-commit] SVN tetex commit + diffs: r460 - in tex-common/trunk: debian scripts

[Norbert Preining]

Author: preining-guest
Date: 2006-01-17 12:01:50 +0000 (Tue, 17 Jan 2006)
New Revision: 460

Modified:
   tex-common/trunk/debian/changelog
   tex-common/trunk/scripts/postinst-tex
   tex-common/trunk/scripts/postinst-texfonts
   tex-common/trunk/scripts/postrm-tex
   tex-common/trunk/scripts/postrm-texfonts
Log:
add --quiet to the debhelper scripts calls to update-updmap, and
include some comments from Ralf into dh_installtex


Modified: tex-common/trunk/debian/changelog
===================================================================
--- tex-common/trunk/debian/changelog	2006-01-16 14:27:52 UTC (rev 459)
+++ tex-common/trunk/debian/changelog	2006-01-17 12:01:50 UTC (rev 460)
@@ -9,10 +9,11 @@
     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).
-  * Fix typo in dh_installtexfonts which would echo wrong file names
-    [preining] 
+  * Fix typo in dh_installtexfonts which would echo wrong file names, and
+    add --quiet to the call of update-updmap in the debhelper scripts
+    [preining]
 
- -- Norbert Preining <preining at logic.at>  Sun, 15 Jan 2006 21:54:39 +0100
+ -- Norbert Preining <preining at logic.at>  Tue, 17 Jan 2006 12:59:25 +0100
 
 tex-common (0.14) unstable; urgency=low
 

Modified: tex-common/trunk/scripts/postinst-tex
===================================================================
--- tex-common/trunk/scripts/postinst-tex	2006-01-16 14:27:52 UTC (rev 459)
+++ tex-common/trunk/scripts/postinst-tex	2006-01-17 12:01:50 UTC (rev 460)
@@ -46,7 +46,7 @@
 }
 
 
-build_format_if_format_exists ()
+build_hyphen_format_if_format_exists ()
 {
     v=`kpsewhich -var-value TEXMFSYSVAR`
     c=`kpsewhich -var-value TEXMFSYSCONFIG`
@@ -54,13 +54,13 @@
     TEXMFCONFIG="$c"
     export TEXMFVAR TEXMFCONFIG
     fmtcnffile=`kpsewhich --format='web2c files' fmtutil.cnf`
-    X=`cat $fmtcnffile | grep "^$2[[:space:]]" || true`
+    # this is slow, and since we hope/assure that all ini files
+    # are installed if the format is active, we don't need the
+    # extra check fmtutil does when called with catcfg
+    # X=`fmtutil-sys --catcfg | grep "^$1[[:space:]]" || true`
+    X=`grep "^[[:space:]]*$1[[:space:]]" $fmtcnffile || true`
     if [ ! "X$X" = "X" ] ; then
-        if [ "X$1" = "X--byhyphen" ] ; then
-            build_format --byhyphen $3
-        else
-            build_format $1 $2
-        fi
+        build_format --byhyphen $2
     fi
 }
 
@@ -86,7 +86,7 @@
 case "$1" in
     configure|abort-upgrade|abort-remove|abort-deconfigure)
     	# it doesn't hurt to cal all of them
-        update-updmap
+        update-updmap --quiet
 	update-language
 	update-fmtutil
 	update_lsr_files
@@ -100,7 +100,7 @@
 			done
 		fi
 		if [ $i = language ] ; then
-			build_format_if_format_exists --byhyphen latex `kpsewhich language.dat`
+			build_hyphen_format_if_format_exists latex `kpsewhich language.dat`
 		fi
 	done
     ;;

Modified: tex-common/trunk/scripts/postinst-texfonts
===================================================================
--- tex-common/trunk/scripts/postinst-texfonts	2006-01-16 14:27:52 UTC (rev 459)
+++ tex-common/trunk/scripts/postinst-texfonts	2006-01-17 12:01:50 UTC (rev 460)
@@ -47,7 +47,7 @@
 
 case "$1" in
     configure|abort-upgrade|abort-remove|abort-deconfigure)
-        update-updmap
+        update-updmap --quiet
 	if which mktexlsr >/dev/null; then 
 	    update_lsr_files
 	fi

Modified: tex-common/trunk/scripts/postrm-tex
===================================================================
--- tex-common/trunk/scripts/postrm-tex	2006-01-16 14:27:52 UTC (rev 459)
+++ tex-common/trunk/scripts/postrm-tex	2006-01-17 12:01:50 UTC (rev 460)
@@ -76,7 +76,7 @@
 case "$1" in
     remove|disappear)
     	# it doesn't hurt to cal all of them
-        check_run_without_errors update-updmap
+        check_run_without_errors update-updmap --quiet
 	check_run_without_errors update-language
 	check_run_without_errors update-fmtutil
 	check_run_without_errors mktexlsr

Modified: tex-common/trunk/scripts/postrm-texfonts
===================================================================
--- tex-common/trunk/scripts/postrm-texfonts	2006-01-16 14:27:52 UTC (rev 459)
+++ tex-common/trunk/scripts/postrm-texfonts	2006-01-17 12:01:50 UTC (rev 460)
@@ -47,7 +47,7 @@
 
 case "$1" in
     remove|disappear)
-        check_run_without_errors update-updmap
+        check_run_without_errors update-updmap --quiet
 	check_run_without_errors mktexlsr
 	check_run_without_errors updmap-sys
     ;;