[subversion-commit] SVN tex-common commit + diffs: r890 - tex-common/trunk/debian

[Frank Küster]

Author: frank
Date: 2006-02-16 16:15:35 +0000 (Thu, 16 Feb 2006)
New Revision: 890

Modified:
   tex-common/trunk/debian/changelog
   tex-common/trunk/debian/common.functions.in
Log:
 - use different variable names for /var/lib/texmf as a texmf.cnf
   variable and as a maintainer script variable


Modified: tex-common/trunk/debian/changelog
===================================================================
--- tex-common/trunk/debian/changelog	2006-02-16 11:15:44 UTC (rev 889)
+++ tex-common/trunk/debian/changelog	2006-02-16 16:15:35 UTC (rev 890)
@@ -8,11 +8,13 @@
       really stop if the md5sum is unknown (closes: #352688) [frank]
     - remove LaTeX and pdfLaTeX format files before trying to recreate all
       format (closes: #352391) [frank]
+    - use different variable names for /var/lib/texmf as a texmf.cnf
+      variable and as a maintainer script variable
   * rework debconf usage (Closes: #352394) [preining]
     - do not manage the ls-R files permissions from now on
     - manage the group and permissions of /var/cache/fonts 
 
- -- Norbert Preining <preining at logic.at>  Tue, 14 Feb 2006 11:39:30 +0100
+ -- Frank Küster <frank at debian.org>  Tue, 14 Feb 2006 14:48:27 +0100
 
 tex-common (0.15) unstable; urgency=high
 

Modified: tex-common/trunk/debian/common.functions.in
===================================================================
--- tex-common/trunk/debian/common.functions.in	2006-02-16 11:15:44 UTC (rev 889)
+++ tex-common/trunk/debian/common.functions.in	2006-02-16 16:15:35 UTC (rev 890)
@@ -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 "$*"
@@ -43,7 +43,7 @@
   # 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 $TEXMFSYSVAR/web2c/$file
+      rm -f $TEXMFSYSVARDIR/web2c/$file
     done
   fi
   if fmtutil-sys $options > $tempfile; then
@@ -210,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