[subversion-commit] SVN tetex commit + diffs: r479 -
tex-common/trunk/debian
Frank Küster
frank at costa.debian.org
Thu Jan 26 18:00:53 UTC 2006
Author: frank
Date: 2006-01-26 18:00:53 +0000 (Thu, 26 Jan 2006)
New Revision: 479
Modified:
tex-common/trunk/debian/postinst.functions
tex-common/trunk/debian/postinst.in
tex-common/trunk/debian/preinst.in
Log:
fix logic in the rearranged maintainer scripts; upgrade from sid and
sarge has been tested.
Modified: tex-common/trunk/debian/postinst.functions
===================================================================
--- tex-common/trunk/debian/postinst.functions 2006-01-26 17:56:45 UTC (rev 478)
+++ tex-common/trunk/debian/postinst.functions 2006-01-26 18:00:53 UTC (rev 479)
@@ -30,7 +30,7 @@
pattern="$3"
failed=false
line=""
- line=`egrep ^$variable $file`
+ line=`egrep "^$variable" $file`
if [ -z "$line" ]; then
echo
echo "An essential entry is missing in $file:"
Modified: tex-common/trunk/debian/postinst.in
===================================================================
--- tex-common/trunk/debian/postinst.in 2006-01-26 17:56:45 UTC (rev 478)
+++ tex-common/trunk/debian/postinst.in 2006-01-26 18:00:53 UTC (rev 479)
@@ -39,13 +39,6 @@
case $action in
configure|reconfigure)
- ## upgrade from 2.0.2 in sarge
- configured_version=$2
- # we must keep changes to the option part of 00updmap.cfg, if it is
- # installed (from an older tetex-base package)
- dpkg --compare-versions \
- $FIRST_VERSION_WITH_UPGRADE_PATH gt "$configured_version" && \
- updmap_extract
# is there a file /etc/texmf/language.dat already? Move it out of the way
if [ -f $OLD_LDAT ]; then
@@ -98,35 +91,32 @@
done
fi
+ update-texmf
# Now we check for some essential settings
- 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/05TeXMF.cnf TEXMFMAIN "/usr/share/texmf"
- check_texmf /etc/texmf/texmf.cnf TEXMFMAIN "/usr/share/texmf"
+ 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/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 \
- "/usr/share/texmf-{tetex,texlive}|/usr/share/texmf-{texlive,tetex}"
+ '/usr/share/texmf-{tetex,texlive}|/usr/share/texmf-{texlive,tetex}'
check_texmf /etc/texmf/texmf.cnf TEXMFDIST \
- "/usr/share/texmf-{tetex,texlive}|/usr/share/texmf-{texlive,tetex}"
- check_texmf /etc/texmf/texmf.d/05TeXMF.cnf "TEXMF( |=)" TEXMFSYSCONFIG
- check_texmf /etc/texmf/texmf.cnf "TEXMF( |=)" TEXMFSYSCONFIG
- check_texmf /etc/texmf/texmf.d/05TeXMF.cnf "TEXMF( |=)" TEXMFSYSVAR
- check_texmf /etc/texmf/texmf.cnf "TEXMF( |=)" TEXMFSYSVAR
- check_texmf /etc/texmf/texmf.d/05TeXMF.cnf "TEXMF( |=)" TEXMFMAIN
- check_texmf /etc/texmf/texmf.cnf "TEXMF( |=)" TEXMFMAIN
- check_texmf /etc/texmf/texmf.d/05TeXMF.cnf "TEXMF( |=)" TEXMFDIST
- check_texmf /etc/texmf/texmf.cnf "TEXMF( |=)" TEXMFDIST
+ '/usr/share/texmf-{tetex,texlive}|/usr/share/texmf-{texlive,tetex}'
+ check_texmf /etc/texmf/texmf.d/05TeXMF.cnf 'TEXMF( |=)' TEXMFSYSCONFIG
+ check_texmf /etc/texmf/texmf.cnf 'TEXMF( |=)' TEXMFSYSCONFIG
+ check_texmf /etc/texmf/texmf.d/05TeXMF.cnf 'TEXMF( |=)' TEXMFSYSVAR
+ check_texmf /etc/texmf/texmf.cnf 'TEXMF( |=)' TEXMFSYSVAR
+ check_texmf /etc/texmf/texmf.d/05TeXMF.cnf 'TEXMF( |=)' TEXMFMAIN
+ check_texmf /etc/texmf/texmf.cnf 'TEXMF( |=)' TEXMFMAIN
+ check_texmf /etc/texmf/texmf.d/05TeXMF.cnf 'TEXMF( |=)' TEXMFDIST
+ check_texmf /etc/texmf/texmf.cnf 'TEXMF( |=)' TEXMFDIST
# run our scripts - this way we ensure that the generated files are
# corrected, should one of the scripts have produced buggy output in
# a prior version
- update-texmf
update-fmtutil
update-updmap
update-language
-# Now we check again for essential settings, in the generated texmf.cnf
- check_texfontmaps /etc/texmf/texmf.cnf
-
#
# set permission of ls-R files
db_get tex-common/managedlsr || true
Modified: tex-common/trunk/debian/preinst.in
===================================================================
--- tex-common/trunk/debian/preinst.in 2006-01-26 17:56:45 UTC (rev 478)
+++ tex-common/trunk/debian/preinst.in 2006-01-26 18:00:53 UTC (rev 479)
@@ -38,11 +38,11 @@
if [ ! -f $keepfile ]; then
cat > $keepfile <<EOF
This file contains the parts of what was called 00updmap.cfg in
-teTeX-2.0.2 that now are handled by tetex-base in 10tetex-base.cfg
+teTeX-2.0.2 that now are handled by tetex-base in 10tetex-base.cfg,
+or tetex-extra in 20tetex-extra.cfg.
If you have local changes, please transfer them manually. Changes
-in the items that are still in 00updmap.cfg have been transferred,
-but changed comments are only here.
+in the items that are still in 00updmap.cfg have been transferred.
EOF
sed -e '0,/^# Map files should be marked by/ d; 1,/^$/ d' \
@@ -85,17 +85,18 @@
mv $tempfile1 $conffile
chmod a+r $conffile
else
- # this part is unchanged, just remove and copy the default file
- # (a copy is already saved).
+ # this part is unchanged, just remove and ucf-purge the file, it will be
+ # reinstalled by postinst (a copy is already saved).
rm -f $tempfile1 $conffile
- cp -p $dfltfile $conffile
+ ucf --purge $conffile
fi
rm -rf "$tempdir"
else
- # unchanged, just remove and copy the default file
+ # unchanged, just remove and ucf-purge the file, it will be
+ # reinstalled by postinst
rm -f $conffile
- cp -p $dfltfile $conffile
+ ucf --purge $conffile
fi
}
@@ -117,7 +118,7 @@
# installed (from an older tetex-base package)
dpkg --compare-versions \
$FIRST_VERSION_WITH_UPGRADE_PATH gt "$configured_version" && \
- updmap_extract
+ updmap_extract || true
;;
failed-upgrade|abort-upgrade)
More information about the Pkg-tetex-commits
mailing list