[subversion-commit] SVN tetex commit + diffs: r340 - in
tex-common/trunk/debian: . md5sums
Frank Küster
frank at costa.debian.org
Wed Nov 16 16:46:35 UTC 2005
Author: frank
Date: 2005-11-16 16:46:34 +0000 (Wed, 16 Nov 2005)
New Revision: 340
Modified:
tex-common/trunk/debian/changelog
tex-common/trunk/debian/common.variables
tex-common/trunk/debian/md5sums/00updmap.cfg.md5sum
tex-common/trunk/debian/postinst.functions
Log:
* Add the md5sum of the postinst-edited 00updmap.cfg to ucf's database.
Also fix the logic for taking over changed settings from tetex-base,
and create 00updmap.cfg with proper permissions. Special thanks to
Junichi Uekawa <dancer at netfort.gr.jp> for insisting (closes: #335682,
#338689) [frank]
Modified: tex-common/trunk/debian/changelog
===================================================================
--- tex-common/trunk/debian/changelog 2005-11-16 08:51:52 UTC (rev 339)
+++ tex-common/trunk/debian/changelog 2005-11-16 16:46:34 UTC (rev 340)
@@ -7,13 +7,18 @@
* Add a function clean_texenvironment to common.functions, to be used
from TeX package's postinst scripts, and document that in the Policy
document. [frank]
+ * Add the md5sum of the postinst-edited 00updmap.cfg to ucf's database.
+ Also fix the logic for taking over changed settings from tetex-base,
+ and create 00updmap.cfg with proper permissions. Special thanks to
+ Junichi Uekawa <dancer at netfort.gr.jp> for insisting (closes: #335682,
+ #338689) [frank]
* Translations:
- add Swedish debconf translation, thanks to Daniel Nylander
<yeager at lidkoping.net> (closes: #338866) [frank]
- update Danish debconf translation, thanks to Claus Hindsgaul
<claus_h at image.dk> (closes: #339354) [frank]
- -- Frank Küster <frank at debian.org> Mon, 14 Nov 2005 17:19:13 +0100
+ -- Frank Küster <frank at debian.org> Wed, 16 Nov 2005 13:37:31 +0100
tex-common (0.10) unstable; urgency=low
Modified: tex-common/trunk/debian/common.variables
===================================================================
--- tex-common/trunk/debian/common.variables 2005-11-16 08:51:52 UTC (rev 339)
+++ tex-common/trunk/debian/common.variables 2005-11-16 16:46:34 UTC (rev 340)
@@ -3,8 +3,8 @@
<:# $Id$:>//
<:# this list is from dpkg-1.10.9/include/dpkg.h.in: :>//
<:$DPKG_EXTENSIONS="'~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist":>//
-<:$PREINST_MOVE_EXT=".preinst-bak":>//
-<:$POSTINST_MOVE_EXT=".postinst-bak":>//
+<:$PREINST_MOVE_EXT="preinst-bak":>//
+<:$POSTINST_MOVE_EXT="postinst-bak":>//
<:$PURGE_EXTENSIONS="$DPKG_EXTENSIONS $PREINST_MOVE_EXT $POSTINST_MOVE_EXT":>//
<:# package specific:>//
<:$ETC="/etc/":>//
Modified: tex-common/trunk/debian/md5sums/00updmap.cfg.md5sum
===================================================================
--- tex-common/trunk/debian/md5sums/00updmap.cfg.md5sum 2005-11-16 08:51:52 UTC (rev 339)
+++ tex-common/trunk/debian/md5sums/00updmap.cfg.md5sum 2005-11-16 16:46:34 UTC (rev 340)
@@ -1,4 +1,5 @@
82884281d955998e22141cf67b45209d 2.0.2
+24eca95ca8668830cea6f0fdcb60fb78 2.0.2, edited by our postint
62bd6e240004565d9e203e8067c210ae 2.95.0.20040208
3a0c2a5cab53cc6eaac66e88c3a53e24 tex-common_0.2
1243f3d8063155dd807c1716fd281446 unknown source with changed comment (#336713)
Modified: tex-common/trunk/debian/postinst.functions
===================================================================
--- tex-common/trunk/debian/postinst.functions 2005-11-16 08:51:52 UTC (rev 339)
+++ tex-common/trunk/debian/postinst.functions 2005-11-16 16:46:34 UTC (rev 340)
@@ -2,6 +2,9 @@
## Function definitions - included from file postinst.functions
#################################################################
+# variables needed, please set in the main file
+# POSTINST_MOVE_EXT
+
###############################################################################
# cfgval(variable)
# read variable ($1) from config file, first match wins
@@ -39,7 +42,9 @@
# is it changed?
if [ ! "$oldmd5sum" = "`md5sum $conffile | cut -d ' ' -f 1`" ]; then
- # changed, stow away a copy for tetex-base
+ # changed.
+
+ # stow away a copy for tetex-base
if [ ! -f $keepfile ]; then
cat > $keepfile <<EOF
This file contains the parts of what was called 00updmap.cfg in
@@ -51,38 +56,55 @@
sed -e '0,/^# Map files should be marked by/ d; 1,/^$/ d' \
$conffile >> $keepfile
fi
- fi
- # get the new defaults
- for option in $options; do
- eval dflt_$option=`cfgval $dfltfile $option`
- done
+ # get the new defaults
+# for option in $options; do
+# eval dflt_$option=`cfgval $dfltfile $option`
+# done
+ # set the settings we had in tetex-base 2.0.2
+ dflt_dvipsPreferOutline=true
+ dflt_LW35=URWkb
+ dflt_pdftexDownloadBase14=false
+ dflt_dvipdfmDownloadBase14=false
+ dflt_dvipsDownloadBase35=false
- # compare with current settings, and create a new file
- SETTING_CHANGED=false
- tempdir=`mktemp -d -p $MKTMPDIR`
- tempfile1=`mktemp -p $tempdir`
- trap 'cleanup' HUP INT QUIT BUS PIPE TERM
- cp -p $dfltfile $tempfile1
- for option in $options; do
- eval $option=`cfgval $conffile $option`
- if eval [ ! "\$$option" = "\$dflt_$option" ]; then
- SETTING_CHANGED=true
- tempfile2=`mktemp -p $tempdir`
- optname=$option
- eval optvalue=\$$option
- eval optoldvalue=\$dflt_$option
- sed -e "s@^[[:space:]]*$optname[[:space:]]*$optoldvalue@$optname $optvalue@" $tempfile1 > $tempfile2
- mv $tempfile2 $tempfile1
+ # compare with current settings, and create a new file
+ SETTING_CHANGED=false
+ tempdir=`mktemp -d -p $MKTMPDIR`
+ tempfile1=`mktemp -p $tempdir`
+ trap 'cleanup' HUP INT QUIT BUS PIPE TERM
+ cp -p $dfltfile $tempfile1
+ for option in $options; do
+ eval $option=`cfgval $conffile $option`
+ if eval [ ! "\$$option" = "\$dflt_$option" ]; then
+ SETTING_CHANGED=true
+ tempfile2=`mktemp -p $tempdir`
+ optname=$option
+ eval optvalue=\$$option
+ eval optoldvalue=\$dflt_$option
+ sed -e "s@^[[:space:]]*$optname[[:space:]]*$optoldvalue@$optname $optvalue@" $tempfile1 > $tempfile2
+ mv $tempfile2 $tempfile1
+ fi
+ done
+ if [ "$SETTING_CHANGED" = "true" ]; then
+ # this mv command will give a "conffile changed by you or a script" message next time
+ # we change it - but that is exactly what has happened: The user has changed options,
+ # and the script has just transferred them to a new file.
+ mv $tempfile1 $conffile
+ chmod a+r $conffile
+ else
+ # this part is unchanged, just remove and copy the default file
+ rm -f $tempfile1 $conffile
+ cp -p $dfltfile $conffile
fi
- done
- if [ "$SETTING_CHANGED" = "true" ]; then
- mv $tempfile1 $conffile
- # this mv command will give a "conffile changed by you or a script" message next time
- # we change it - but that is exactly what has happened: The user has changed options,
- # and the script has just transferred them to a new file.
+ rm -rf "$tempdir"
+
+ else
+ # unchanged, just remove and copy the default file
+ rm -f $conffile
+ cp -p $dfltfile $conffile
fi
- rm -rf "$tempdir"
+
}
check_texfontmaps(){
More information about the Pkg-tetex-commits
mailing list