[subversion-commit] SVN tetex commit + diffs: r219 - in
tetex-bin/trunk/debian: . md5sums
Frank Küster
frank at costa.debian.org
Fri Oct 14 10:13:21 UTC 2005
Author: frank
Date: 2005-10-14 10:13:17 +0000 (Fri, 14 Oct 2005)
New Revision: 219
Added:
tetex-bin/trunk/debian/md5sums/01tetex.cnf.md5sum
Removed:
tetex-bin/trunk/debian/md5sums/05TeXMF.cnf.md5sum
tetex-bin/trunk/debian/md5sums/15Plain.cnf.md5sum
tetex-bin/trunk/debian/md5sums/45TeXinputs.cnf.md5sum
tetex-bin/trunk/debian/md5sums/55Fonts.cnf.md5sum
tetex-bin/trunk/debian/md5sums/65BibTeX.cnf.md5sum
tetex-bin/trunk/debian/md5sums/75DviPS.cnf.md5sum
tetex-bin/trunk/debian/md5sums/85Misc.cnf.md5sum
tetex-bin/trunk/debian/md5sums/90TeXDoc.cnf.md5sum
tetex-bin/trunk/debian/md5sums/95NonPath.cnf.md5sum
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
tetex-bin/trunk/debian/rules
tetex-bin/trunk/debian/tetex-bin_install.in
tetex-bin/trunk/debian/variables
Log:
* Provide a transition from fmt.d/00tetex.cnf to fmt.d/01tetex.cnf,
which is now under ucf control (closes: #333732, #330278) (some other
aspects of #330278 have been fixed by the upload of tetex-base version
3.0-8). [frank]
- migration of changed code from tex-common to common.*
- removed unneeded md5sums files
Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog 2005-10-13 14:52:15 UTC (rev 218)
+++ tetex-bin/trunk/debian/changelog 2005-10-14 10:13:17 UTC (rev 219)
@@ -18,9 +18,13 @@
thanks to Kurt Roeckx <kurt at roeckx.be> (closes: #332840) [frank]
* Remove the code for handling permissions of ls-R files. This is now
done by tex-common. Since we are still in experimental, I don't
- increase the versioned dependency on tex-common.
+ increase the versioned dependency on tex-common. [frank]
+ * Provide a transition from fmt.d/00tetex.cnf to fmt.d/01tetex.cnf,
+ which is now under ucf control (closes: #333732, #330278) (some other
+ aspects of #330278 have been fixed by the upload of tetex-base version
+ 3.0-8). [frank]
- -- Frank Küster <frank at debian.org> Wed, 12 Oct 2005 09:46:30 +0200
+ -- Frank Küster <frank at debian.org> Fri, 14 Oct 2005 12:12:11 +0200
tetex-bin (3.0-7) experimental; urgency=low
Modified: tetex-bin/trunk/debian/common.functions.in
===================================================================
--- tetex-bin/trunk/debian/common.functions.in 2005-10-13 14:52:15 UTC (rev 218)
+++ tetex-bin/trunk/debian/common.functions.in 2005-10-14 10:13:17 UTC (rev 219)
@@ -193,6 +193,16 @@
fi
}
+select_lsrfile() {
+ case $1 in
+ main) LSR=$TEXMFSYSVAR/ls-R-TEXMFMAIN ;;
+ var) LSR=$TEXMFSYSVAR/ls-R ;;
+ cache) LSR=/var/cache/fonts/ls-R ;;
+ *) echo "select_lsr: don't know how to set this: $1" >&2 ;;
+ esac
+ echo $LSR
+}
+
#################################################################
## End of function definitions from file common.functions
#################################################################
Modified: tetex-bin/trunk/debian/common.variables
===================================================================
--- tetex-bin/trunk/debian/common.variables 2005-10-13 14:52:15 UTC (rev 218)
+++ tetex-bin/trunk/debian/common.variables 2005-10-14 10:13:17 UTC (rev 219)
@@ -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/":>//
Added: tetex-bin/trunk/debian/md5sums/01tetex.cnf.md5sum
===================================================================
--- tetex-bin/trunk/debian/md5sums/01tetex.cnf.md5sum 2005-10-13 14:52:15 UTC (rev 218)
+++ tetex-bin/trunk/debian/md5sums/01tetex.cnf.md5sum 2005-10-14 10:13:17 UTC (rev 219)
@@ -0,0 +1,3 @@
+55811af3562faf342261dbc3b5e060a2 00tetex.cnf in 2.0.2
+757459dda86e1bd31e68dacbba9b422d 01tetex.cnf in 3.0
+
Deleted: tetex-bin/trunk/debian/md5sums/05TeXMF.cnf.md5sum
===================================================================
--- tetex-bin/trunk/debian/md5sums/05TeXMF.cnf.md5sum 2005-10-13 14:52:15 UTC (rev 218)
+++ tetex-bin/trunk/debian/md5sums/05TeXMF.cnf.md5sum 2005-10-14 10:13:17 UTC (rev 219)
@@ -1,4 +0,0 @@
-f25db81f58ec6271eba7e4dc11da765f 2.0.2-8
-e94ddbfbaacce5da586be595feebf71f 2.0.2-7
-3b2d2ef73d731db452ed1bfdf8eabd4b 1.0.7+20011202
-6fdb6219510d59a78e2bf68a0caff5e5 1.0.7-CVS
Deleted: tetex-bin/trunk/debian/md5sums/15Plain.cnf.md5sum
===================================================================
--- tetex-bin/trunk/debian/md5sums/15Plain.cnf.md5sum 2005-10-13 14:52:15 UTC (rev 218)
+++ tetex-bin/trunk/debian/md5sums/15Plain.cnf.md5sum 2005-10-14 10:13:17 UTC (rev 219)
@@ -1,3 +0,0 @@
-88e81a74d28599df75e8acdf712711a0 2.0.2-4.3
-88e81a74d28599df75e8acdf712711a0 2.0.2-11
-88e81a74d28599df75e8acdf712711a0 1.0.7+20011202
Deleted: tetex-bin/trunk/debian/md5sums/45TeXinputs.cnf.md5sum
===================================================================
--- tetex-bin/trunk/debian/md5sums/45TeXinputs.cnf.md5sum 2005-10-13 14:52:15 UTC (rev 218)
+++ tetex-bin/trunk/debian/md5sums/45TeXinputs.cnf.md5sum 2005-10-14 10:13:17 UTC (rev 219)
@@ -1,2 +0,0 @@
-f6a1a0dd6b95a742139c3120f3238c81 2.0.2-11
-9411ee616c8423f4f3c32359dee74795 1.0.7+20011202
Deleted: tetex-bin/trunk/debian/md5sums/55Fonts.cnf.md5sum
===================================================================
--- tetex-bin/trunk/debian/md5sums/55Fonts.cnf.md5sum 2005-10-13 14:52:15 UTC (rev 218)
+++ tetex-bin/trunk/debian/md5sums/55Fonts.cnf.md5sum 2005-10-14 10:13:17 UTC (rev 219)
@@ -1,3 +0,0 @@
-0a93ffca0492dea8422bdd0c6fd4c3de 2.0.2-4.3
-0a93ffca0492dea8422bdd0c6fd4c3de 2.0.2-11
-0a93ffca0492dea8422bdd0c6fd4c3de 1.0.7+20011202
Deleted: tetex-bin/trunk/debian/md5sums/65BibTeX.cnf.md5sum
===================================================================
--- tetex-bin/trunk/debian/md5sums/65BibTeX.cnf.md5sum 2005-10-13 14:52:15 UTC (rev 218)
+++ tetex-bin/trunk/debian/md5sums/65BibTeX.cnf.md5sum 2005-10-14 10:13:17 UTC (rev 219)
@@ -1,3 +0,0 @@
-a3fb54a413f1dfd0d4b6b5b3b9a502d8 2.0.2-4.3
-a3fb54a413f1dfd0d4b6b5b3b9a502d8 2.0.2-11
-a3fb54a413f1dfd0d4b6b5b3b9a502d8 1.0.7+20011202
Deleted: tetex-bin/trunk/debian/md5sums/75DviPS.cnf.md5sum
===================================================================
--- tetex-bin/trunk/debian/md5sums/75DviPS.cnf.md5sum 2005-10-13 14:52:15 UTC (rev 218)
+++ tetex-bin/trunk/debian/md5sums/75DviPS.cnf.md5sum 2005-10-14 10:13:17 UTC (rev 219)
@@ -1,2 +0,0 @@
-f2491ed69ebb56e8ba2bcd493d216e97 2.0.2-8
-731d2c9ebf22e8f636f7bad7858ee6d2 1.0.7+20011202
Deleted: tetex-bin/trunk/debian/md5sums/85Misc.cnf.md5sum
===================================================================
--- tetex-bin/trunk/debian/md5sums/85Misc.cnf.md5sum 2005-10-13 14:52:15 UTC (rev 218)
+++ tetex-bin/trunk/debian/md5sums/85Misc.cnf.md5sum 2005-10-14 10:13:17 UTC (rev 219)
@@ -1,2 +0,0 @@
-eba0feb6847e356f1f91af9750012626 2.0.2-8
-743d1cefb4f11e48cd8cad1092c1c8ff 1.0.7+20011202
Deleted: tetex-bin/trunk/debian/md5sums/90TeXDoc.cnf.md5sum
===================================================================
--- tetex-bin/trunk/debian/md5sums/90TeXDoc.cnf.md5sum 2005-10-13 14:52:15 UTC (rev 218)
+++ tetex-bin/trunk/debian/md5sums/90TeXDoc.cnf.md5sum 2005-10-14 10:13:17 UTC (rev 219)
@@ -1,2 +0,0 @@
-e6a4e65d7832eebce840f1c91df5aa8b 2.0.2-4.3
-7e8f87acdeba48edac16d851c77b9e75 2.0.2-11
Deleted: tetex-bin/trunk/debian/md5sums/95NonPath.cnf.md5sum
===================================================================
--- tetex-bin/trunk/debian/md5sums/95NonPath.cnf.md5sum 2005-10-13 14:52:15 UTC (rev 218)
+++ tetex-bin/trunk/debian/md5sums/95NonPath.cnf.md5sum 2005-10-14 10:13:17 UTC (rev 219)
@@ -1,6 +0,0 @@
-e45f13f4289902c57e747b775ce5e7ff 2.0.2-11
-a8ac3041655a550cffa56c1dbf3203b7 2.0.2-8
-5e42201ef8b41fe090b6facdc7e71497 1.0.7+20011202
-a7078537631aeb40e2ca1b175ded2ac5 1.0.7-5
-ecd63d2cb4d1527bd19b37cf98a1f496 2.0
-10a7d60944ad23fc090609baff1f28ee 2.99.9
Modified: tetex-bin/trunk/debian/postinst.in
===================================================================
--- tetex-bin/trunk/debian/postinst.in 2005-10-13 14:52:15 UTC (rev 218)
+++ tetex-bin/trunk/debian/postinst.in 2005-10-14 10:13:17 UTC (rev 219)
@@ -13,8 +13,13 @@
DFLT=/usr/share/tetex-base/language.dflt
LSRS="<:=$LSRS:>"
TEXMFCNF=<:=$TEXMF_CNF:>
+#UCF="ucf --verbose -d --debconf-ok"
+UCF="ucf --debconf-ok"
+
# Variables needed for upgrading
+UCF_FILES=<:=$UCF_FILES:>
+UCF_SOURCEDIR=/usr/share/tetex-bin
OLD_WEB2C=<:=$OLD_WEB2C:>
SYMLINK_MOVE_EXT=<:=$SYMLINK_MOVE_EXT:>
WOODY_FMTCNF=<:=$WOODY_FMTCNF:>
@@ -92,6 +97,13 @@
# around this.
sanitize_texmfcnf
+# upgrade from sarge: fmtutil snippet renamed
+ for name in $UCF_FILES; do
+ filename=`basename $name`
+ $UCF $UCF_SOURCEDIR/$filename /etc/texmf/$name
+ done
+
+
# upgrade from woody
# handling of fmtutil.cnf
# determine which kind of fmtutil setup was used previously
Modified: tetex-bin/trunk/debian/postrm.in
===================================================================
--- tetex-bin/trunk/debian/postrm.in 2005-10-13 14:52:15 UTC (rev 218)
+++ tetex-bin/trunk/debian/postrm.in 2005-10-14 10:13:17 UTC (rev 219)
@@ -2,7 +2,7 @@
#!/bin/sh -e
#
# postrm maintainer script for the Debian <:=${PACKAGE}:> package.
-# $Id: postrm.in,v 1.1.2.3 2005/03/14 15:32:13 frank Exp $
+# $Id$
<:=@COPYRIGHT:>//
## variables
@@ -13,10 +13,39 @@
VERYOLD_FONTCACHE=/var/spool/texmf
OBS_CONFFILES="/etc/texmf/fmtutil.cnf /etc/texmf/updmap.cfg"
OLD_WEB2C=<:=$OLD_WEB2C:>
+UCF_FILES=<:=$UCF_FILES:>
# give commandline args a name
action=$1 # remove, purge, upgrade, failed-upgrade, abort-install, abort-upgrade, disappear
+# the following function is from tetex-base's postrm.functions; it should be included in
+# a new common.postrm.functions file in tex-common.
+ucf_purge(){
+ directory=/etc/texmf
+ case "$1" in
+ -d|--directory)
+ directory=$2
+ shift 2
+ ;;
+ esac
+ filelist="$@"
+ if [ -x /usr/bin/ucf ]; then # we can't rely on ucf being still installed in postrm
+ purgefile(){ ucf --purge $1; remove_with_backups $1; }
+ else
+ purgefile(){ remove_with_backups $1; }
+ fi
+ for file in $filelist; do
+ # does this filename start with a leading slash?
+ relativename=${file#/}
+ if [ ! "$file" = "$relativename" ]; then
+ # leading slash, change directory
+ directory=`dirname $file`
+ file=`basename $file`
+ fi
+ purgefile $directory/$file
+ done
+}
+
<:open(FUNCTIONS,'postrm.functions');@FUNCTIONS=<FUNCTIONS>;close(FUNCTIONS):>//
<:=@FUNCTIONS:>//
@@ -83,6 +112,7 @@
rm -rf $TEXMFSYSVAR/fonts
;;
purge)
+ ucf_purge $UCF_FILES
;;
*)
;;
Modified: tetex-bin/trunk/debian/preinst.in
===================================================================
--- tetex-bin/trunk/debian/preinst.in 2005-10-13 14:52:15 UTC (rev 218)
+++ tetex-bin/trunk/debian/preinst.in 2005-10-14 10:13:17 UTC (rev 219)
@@ -6,8 +6,8 @@
<:=@COPYRIGHT:>//
# Define static variables we need
-UCF_FILES="<:=$UCF_FILES:>"
-ETCTEXMF=/etc/texmf/texmf.d
+#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
@@ -38,12 +38,23 @@
install|upgrade)
# make sure we don't end up without a texmf.cnf
ucf_purge_texmf_maybe
- # rename old conffiles in texmf.d (handled by ucf now so the user won't get strange questions)
- for file in $UCF_FILES; do
- if [ -f $TEXMF_DIR/$file ] && [ ! -f $TEXMF_DIR/$file.cnf ]; then
- mv $TEXMF_DIR/$file $TEXMF_DIR/$file.cnf
+ # rename 00tetex.cnf to 01tetex.cnf
+ if [ -f $ETCTEXMF/fmt.d/00tetex.cnf ]; then
+ if [ ! -f $ETCTEXMF/fmt.d/01tetex.cnf ]; then
+ # not yet transitioned
+ mv $ETCTEXMF/fmt.d/00tetex.cnf $ETCTEXMF/fmt.d/01tetex.cnf
+ else
+ # some older experimental version has installed the new file, but not
+ # transitioned the old one.
+ current_md5sum=`md5sum $ETCTEXMF/fmt.d/00tetex.cnf | cut -d ' ' -f 1`
+ if [ "$current_md5sum" = "55811af3562faf342261dbc3b5e060a2" ]; then
+ rm $ETCTEXMF/fmt.d/00tetex.cnf
+ else
+ # we do nothing; experimental users should be able to solve this
+ :
+ fi
fi
- done
+ fi
# dpkg won't change a symlink to a directory; therefore we first move it out
# of the way
Modified: tetex-bin/trunk/debian/rules
===================================================================
--- tetex-bin/trunk/debian/rules 2005-10-13 14:52:15 UTC (rev 218)
+++ tetex-bin/trunk/debian/rules 2005-10-14 10:13:17 UTC (rev 219)
@@ -239,6 +239,7 @@
debian/tetex-bin_install --conffiles
debian/tetex-bin_install --xdvi
debian/tetex-bin_install --misc
+ debian/tetex-bin_install --omfonts
install-lib: build-stamp
Modified: tetex-bin/trunk/debian/tetex-bin_install.in
===================================================================
--- tetex-bin/trunk/debian/tetex-bin_install.in 2005-10-13 14:52:15 UTC (rev 218)
+++ tetex-bin/trunk/debian/tetex-bin_install.in 2005-10-14 10:13:17 UTC (rev 219)
@@ -84,14 +84,14 @@
--conffiles)
if [ $ACTION = install ]; then
fmtutil_source=$txmfdir/web2c/fmtutil.cnf
- # cut away from configuration files the parts already in tex-common
- sed -n -e '0,/^# initex (or another/ d;p' $fmtutil_source > $debetc/fmt.d/01tetex.cnf
- mv $fmtutil_source $sharedir/tetex-bin
+ # cut away from configuration files the parts that are already in tex-common
+ sed -n -e '0,/^# initex (or another/ d;p' $fmtutil_source > $sharedir/$package/01tetex.cnf
+ mv $fmtutil_source $sharedir/$package
# remove texmf.cnf (is now in tex-common)
rm $txmfdir/web2c/texmf.cnf
else
mv $sharedir/tetex-bin/fmtutil.cnf $txmfdir/web2c/
- rm $debetc/fmt.d/00tetex.cnf
+ #rm $debetc/fmt.d/00tetex.cnf
fi
;;
--xdvi)
Modified: tetex-bin/trunk/debian/variables
===================================================================
--- tetex-bin/trunk/debian/variables 2005-10-13 14:52:15 UTC (rev 218)
+++ tetex-bin/trunk/debian/variables 2005-10-14 10:13:17 UTC (rev 219)
@@ -13,6 +13,7 @@
<:$SYMLINK_MOVE_EXT="moved-by-preinst":>//
<:$WOODY_FMTCNF="$PKG_SHAREDIR/fmtutil.cnf.1.0.7":>//
<:### Variables needed for upgrades since sarge:>//
+<:$UCF_FILES="fmt.d/01tetex.cnf":>//
<:# Misc package variables:>//
<:$INFOSEC="Document Preparation":>//
<:$EPRIORITY="50":>//
More information about the Pkg-tetex-commits
mailing list