[subversion-commit] SVN tetex commit + diffs: r522 -
tetex-bin/trunk/debian
Frank Küster
frank at costa.debian.org
Tue Feb 14 13:52:37 UTC 2006
Author: frank
Date: 2006-02-14 13:52:36 +0000 (Tue, 14 Feb 2006)
New Revision: 522
Modified:
tetex-bin/trunk/debian/changelog
tetex-bin/trunk/debian/common.functions.in
tetex-bin/trunk/debian/common.variables
tetex-bin/trunk/debian/postinst.in
tetex-bin/trunk/debian/postrm.in
tetex-bin/trunk/debian/preinst.in
Log:
Use a different name for the maintainer script variable that points to
/var/lib/texmf than for the texmf.cnf and environment variable for the
same directory; and remove the setting from preinst which doesn't use it.
Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog 2006-02-14 12:38:08 UTC (rev 521)
+++ tetex-bin/trunk/debian/changelog 2006-02-14 13:52:36 UTC (rev 522)
@@ -17,7 +17,10 @@
Ross Boylan <RossBoylan at stanfordalumni.org> for spotting this (closes:
#352564) [frank]
* remove LaTeX and pdfLaTeX format files before trying to recreate all
- format (closes: #352391) [frank]
+ formats. To achieve this properly, use a different name for the
+ maintainer script variable that points to /var/lib/texmf than for the
+ texmf.cnf and environment variable for the same directory (closes:
+ #352391) [frank]
-- Frank Küster <frank at debian.org> Mon, 13 Feb 2006 16:06:31 +0100
Modified: tetex-bin/trunk/debian/common.functions.in
===================================================================
--- tetex-bin/trunk/debian/common.functions.in 2006-02-14 12:38:08 UTC (rev 521)
+++ tetex-bin/trunk/debian/common.functions.in 2006-02-14 13:52:36 UTC (rev 522)
@@ -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 "$*"
@@ -42,8 +42,8 @@
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.lg pdflatex.fmt pdflatex.efmt pdflatex.log; do
- rm $TEXMFSYSVAR/web2c/file
+ 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
@@ -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
Modified: tetex-bin/trunk/debian/common.variables
===================================================================
--- tetex-bin/trunk/debian/common.variables 2006-02-14 12:38:08 UTC (rev 521)
+++ tetex-bin/trunk/debian/common.variables 2006-02-14 13:52:36 UTC (rev 522)
@@ -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-bin/trunk/debian/postinst.in
===================================================================
--- tetex-bin/trunk/debian/postinst.in 2006-02-14 12:38:08 UTC (rev 521)
+++ tetex-bin/trunk/debian/postinst.in 2006-02-14 13:52:36 UTC (rev 522)
@@ -6,7 +6,7 @@
<:=@COPYRIGHT:>//
## Define static variables we need
-TEXMFSYSVAR=<:=$TEXMFSYSVAR:>
+TEXMFSYSVARDIR=<:=$TEXMFSYSVARDIR:>
MOVE_EXT=<:=$POSTINST_MOVE_EXT:>
LDAT=/etc/texmf/language.dat
DFLT=/usr/share/tetex-base/language.dflt
@@ -23,9 +23,9 @@
SYMLINK_MOVE_EXT=<:=$SYMLINK_MOVE_EXT:>
WOODY_FMTCNF=<:=$WOODY_FMTCNF:>
ETC_FMTCNF=/etc/texmf/fmtutil.cnf
-VAR_FMTCNF=$TEXMFSYSVAR/web2c/fmtutil.cnf
+VAR_FMTCNF=$TEXMFSYSVARDIR/web2c/fmtutil.cnf
ETC_MAPCFG=/etc/texmf/updmap.cfg
-VAR_MAPCFG=$TEXMFSYSVAR/web2c/updmap.cfg
+VAR_MAPCFG=$TEXMFSYSVARDIR/web2c/updmap.cfg
LDAT_PATTERNS="<:=$LDAT_PATTERNS:>"
LDAT_VERSION=2.0.2a-1 # this should be the version of tetex-base
# that ships the correct language.dflt
@@ -75,7 +75,7 @@
fi
# remove generated map files of older versions
- rm -rf $TEXMFSYSVAR/dvips
+ rm -rf $TEXMFSYSVARDIR/dvips
#pdftexconfig_transition
@@ -115,9 +115,9 @@
# we use the actual generated file
COMPARE_FMTCNF=$VAR_FMTCNF
fi
- # if $TEXMFSYSVAR/fmtutil.cnf is a symlink, we have to move it out of the way.
- if [ -L $TEXMFSYSVAR/fmtutil.cnf ]; then
- mv $TEXMFSYSVAR/fmtutil.cnf $TEXMFSYSVAR/fmtutil.cnf.$MOVE_EXT
+ # if $TEXMFSYSVARDIR/fmtutil.cnf is a symlink, we have to move it out of the way.
+ if [ -L $TEXMFSYSVARDIR/fmtutil.cnf ]; then
+ mv $TEXMFSYSVARDIR/fmtutil.cnf $TEXMFSYSVARDIR/fmtutil.cnf.$MOVE_EXT
fi
# now generate the new fmtutil.cnf
update-fmtutil --quiet
@@ -132,9 +132,9 @@
# upgrade from woody
# updmap.cfg handling
update-updmap --quiet
- # if $TEXMFSYSVAR/updmap.cfg is a symlink, we have to move it out of the way.
- if [ -L $TEXMFSYSVAR/updmap.cfg ]; then
- mv $TEXMFSYSVAR/updmap.cfg $TEXMFSYSVAR/updmap.cfg.$MOVE_EXT
+ # if $TEXMFSYSVARDIR/updmap.cfg is a symlink, we have to move it out of the way.
+ if [ -L $TEXMFSYSVARDIR/updmap.cfg ]; then
+ mv $TEXMFSYSVARDIR/updmap.cfg $TEXMFSYSVARDIR/updmap.cfg.$MOVE_EXT
fi
# now we have to check whether there are user-added lines, create a local
# configuration file, and run the update program once more if yes.
@@ -175,7 +175,6 @@
# now create the formats. We have to remove the old ones first, in case
# engines have changed
clean_texenvironment
- rm -f $TEXMFSYSVAR/web2c/*fmt
create_tetex_formats --all
# now create the font map files.
Modified: tetex-bin/trunk/debian/postrm.in
===================================================================
--- tetex-bin/trunk/debian/postrm.in 2006-02-14 12:38:08 UTC (rev 521)
+++ tetex-bin/trunk/debian/postrm.in 2006-02-14 13:52:36 UTC (rev 522)
@@ -7,7 +7,7 @@
## variables
PURGE_EXTENSIONS="<:=$PURGE_EXTENSIONS:>"
-TEXMFSYSVAR=<:=$TEXMFSYSVAR:>
+TEXMFSYSVARDIR=<:=$TEXMFSYSVARDIR:>
VARTOP_GENERATED="<:=$VARTOP_GENERATED:>"
VERYOLD_TEXMF=<:=$VERYOLD_TEXMF:>
VERYOLD_FONTCACHE=/var/spool/texmf
@@ -111,13 +111,13 @@
remove)
# remove /var/lib/texmf/web2c/*
# no longer do this: things are removed by tex-common
- # rm -f $TEXMFSYSVAR/web2c/* # nukes tetex-base's mktex.cnf
+ # rm -f $TEXMFSYSVARDIR/web2c/* # nukes tetex-base's mktex.cnf
- # remove generated files in $TEXMFSYSVAR
- for file in $VARTOP_GENERATED; do rm -f $TEXMFSYSVAR/$file; done
+ # remove generated files in $TEXMFSYSVARDIR
+ for file in $VARTOP_GENERATED; do rm -f $TEXMFSYSVARDIR/$file; done
# remove generated map files
- rm -rf $TEXMFSYSVAR/fonts
+ rm -rf $TEXMFSYSVARDIR/fonts
;;
purge)
ucf_purge $UCF_FILES
Modified: tetex-bin/trunk/debian/preinst.in
===================================================================
--- tetex-bin/trunk/debian/preinst.in 2006-02-14 12:38:08 UTC (rev 521)
+++ tetex-bin/trunk/debian/preinst.in 2006-02-14 13:52:36 UTC (rev 522)
@@ -8,7 +8,6 @@
# Define static variables we need
#UCF_FILES="<:=$UCF_FILES:>" # only 01tetex.cnf, handled specially without specific reason
ETCTEXMF=/etc/texmf
-TEXMFSYSVAR=<:=$TEXMFSYSVAR:>
OLD_WEB2C=<:=$OLD_WEB2C:>
VARFONTSFILE=/etc/texmf/varfontdirs.debian
MOVE_EXT=<:=$PREINST_MOVE_EXT:>
More information about the Pkg-tetex-commits
mailing list