[subversion-commit] SVN tetex-base commit + diffs: r922 - tetex-base/trunk/debian

[Frank Küster]

Author: frank
Date: 2006-02-23 14:17:13 +0000 (Thu, 23 Feb 2006)
New Revision: 922

Modified:
   tetex-base/trunk/debian/common.functions.in
   tetex-base/trunk/debian/common.variables
   tetex-base/trunk/debian/rules
Log:
propagate changes from tex-common/changelog

Modified: tetex-base/trunk/debian/common.functions.in
===================================================================
--- tetex-base/trunk/debian/common.functions.in	2006-02-23 14:11:45 UTC (rev 921)
+++ tetex-base/trunk/debian/common.functions.in	2006-02-23 14:17:13 UTC (rev 922)
@@ -9,7 +9,7 @@
 : ${MKTMPDIR:=$TMPDIR} # mktemp will create its files there
 : ${MKTMPDIR:=<:=$MKTMPDIR:>}
 SYMLINK_MOVE_EXT=<:=$SYMLINK_MOVE_EXT:>
-TEXMFSYSVAR=<:=$TEXMFSYSVAR:>
+TEXMFSYSVARDIR=<:=$TEXMFSYSVARDIR:>
 
 debug(){
   true "$*"
@@ -40,6 +40,12 @@
   options="$@"
   tempfile=`mktemp -p $MKTMPDIR tetex.postinst.XXXXXXXX`
   echo "Running fmtutil-sys. This may take some time. ..."
+  # for jadetex safety (see #352391 and friends), remove old latex formats
+  if [ "$options" = "--all" ];
+    then for file in latex.fmt latex.efmt latex.log pdflatex.fmt pdflatex.efmt pdflatex.log; do
+      rm -f $TEXMFSYSVARDIR/web2c/$file
+    done
+  fi
   if fmtutil-sys $options > $tempfile; then
     rm -f $tempfile
   else
@@ -204,8 +210,8 @@
 
 select_lsrfile() {
     case $1 in
-     main) LSR=$TEXMFSYSVAR/ls-R-TEXMFMAIN ;;
-     var)  LSR=$TEXMFSYSVAR/ls-R ;;
+     main) LSR=$TEXMFSYSVARDIR/ls-R-TEXMFMAIN ;;
+     var)  LSR=$TEXMFSYSVARDIR/ls-R ;;
      cache) LSR=/var/cache/fonts/ls-R ;;
      *) echo "select_lsr: don't know how to set this: $1" >&2 ;;
     esac
@@ -444,6 +450,7 @@
 
 teTeX3_md5sumlist="
  /etc/texmf/latex/microtype.cfg 649944bb5f193e75dba7604b9515317f
+ /etc/texmf/map/dvips/ams/psfonts.ams 4b9748dab405dfea8ed231f49c6d41be  
 "
 
 get_sarge_md5sum_from_list(){
@@ -458,7 +465,7 @@
     fi
   done
   echo "$file: md5sum not known. Exiting" >&2
-  exit 1
+  return 1
 }
 
 preinst_remove_or_move(){

Modified: tetex-base/trunk/debian/common.variables
===================================================================
--- tetex-base/trunk/debian/common.variables	2006-02-23 14:11:45 UTC (rev 921)
+++ tetex-base/trunk/debian/common.variables	2006-02-23 14:17:13 UTC (rev 922)
@@ -10,7 +10,7 @@
 <:$ETC="/etc/":>//
 <:$etc="/etc/texmf/":>//
 <:$doc="/usr/share/doc/$PACKAGE/":>//
-<:$TEXMFSYSVAR="/var/lib/texmf":>//
+<:$TEXMFSYSVARDIR="/var/lib/texmf":>//
 <:$MKTMPDIR="/tmp":>//
 <:$FONTMAP_MEMORY_DIR="/var/lib/tex-common/fontmap-cfg":>//
 <:$LANGUAGE_MEMORY_DIR="/var/lib/tex-common/language-cnf":>//

Modified: tetex-base/trunk/debian/rules
===================================================================
--- tetex-base/trunk/debian/rules	2006-02-23 14:11:45 UTC (rev 921)
+++ tetex-base/trunk/debian/rules	2006-02-23 14:17:13 UTC (rev 922)
@@ -220,7 +220,7 @@
 
 debian/sarge-stamp: 
 	cp debian/changelog debian/sarge/changelog.sid
-	sed -e s/3.0-13.1/3.0-12sarge13.1/ debian/sarge/changelog.sid \
+	sed -e s/3.0-14/3.0-13sarge14/ debian/sarge/changelog.sid \
 	  > debian/changelog && rm debian/sid-stamp
 	# need to remake rules
 	touch debian/rules.in