Bug#213310: omega.map, all map files, and generated map files
Yannick, I'm keeping you in as the submitter of the recent omega.map
bug, but this is more general. For further information, read
http://bugs.debian.org/213310.
Attached are two patches, one for tetex-base and one for tetex-bin. They
try to fix both bugs (#213310 and #246818), but it's a radical
approach. Therefore I wouldn't like to check this in without hearing
some comments.
Unfortunately, I was working on two other small issues at the same
time. Therefore these are also contained in the patches (see below).
This is what I do:
- tetex-bin sets now VARTEXMF in 05TeXMF.cnf and puts it in MAINTEXMF
(and depends on the proper version of tetex-base)
- tetex-base creates the link /usr/share/texmf/ls-R to a target with a
new name, /var/lib/texmf/ls-R-TEXMFMAIN, because
VARTEXMF=/var/lib/texmf will get its own ls-R file
- tetex-base does no longer move any of the static map files to /etc/,
but treats them as ordinary files in TEXMFMAIN
- The link from /usr/share/texmf/dvips/config to /etc/texmf/dvips is
still there for the config.* files and for map files of other
packages.
- Since VARTEXMF is set, updmap creates the generated map files in
/var/lib/texmf/dvips/config.
What I have not yet done is delete the ucf stuff for the map files that
no longer need this (and ucf-purge those).
I would be glad to hear some comments on that; I have tested it on my
system, but so far only used pdflatex.
Appendix: The other changes
- tetex-bin ships the language.dat link in the deb
- tetex-base patches texfind and texshow to display the same tetex-xwarn
messages as texdoctk.
Regards, Frank
--
Frank Küster, Biozentrum der Univ. Basel
Abt. Biophysikalische Chemie
diff --exclude=*.po --exclude=*.pot --exclude=CVS -Nur tetex-base-2.0.2-CVS/debian/changelog tetex-base-CVS/debian/changelog
--- tetex-base-2.0.2-CVS/debian/changelog Sat May 8 16:43:47 2004
+++ tetex-base-CVS/debian/changelog Mon May 10 17:41:02 2004
@@ -1,3 +1,11 @@
+tetex-base (2.0.2-8.51) unstable; urgency=low
+
+ * test not to move/link maps
+ * patch texfind.pl and texshow.pl to show useful error messages if
+ perl-tk is not installed.
+
+ -- Frank Küster <frank@debian.org> Mon, 10 May 2004 11:13:28 +0200
+
tetex-base (2.0.2-8.4) unstable; urgency=low
* Correct redirections in reportbug scripts (thanks to Yannick
diff --exclude=*.po --exclude=*.pot --exclude=CVS -Nur tetex-base-2.0.2-CVS/debian/control tetex-base-CVS/debian/control
--- tetex-base-2.0.2-CVS/debian/control Sat May 8 16:30:52 2004
+++ tetex-base-CVS/debian/control Mon May 10 17:36:27 2004
@@ -11,7 +11,7 @@
Depends: texinfo (>= 4.0b-1), debconf, ucf (>= 1.02)
Replaces: texidoc, bibtex, texpsfnt, mfbasfnt, xdvik, dvipsk, mfnfss, latex, texlib, mflib, textfm, kpathsea, latex2e-doc, ltxgraph, csplain, cslatex, cstexfonts, tetex-extra (<< 2.0.2-7), tetex-doc (<< 1.0.2+20011128), tetex-nonfree, pxfonts, txfonts, mfpic, dvipdfm, texdoctk
Pre-Depends: dpkg (>=1.6.8)
-Conflicts: texidoc, bibtex, texpsfnt, mfbasfnt, xdvik, mfnfss, texlib, mflib, textfm, kpathsea, latex2e-doc, ltxgraph, csplain, cslatex, cstexfonts, tetex-bin (<= 2.0.2-3), xbase (<< 3.3.2.3a-2), tetex-nonfree (<< 1.0.2+20000804-2), pxfonts, txfonts, mfpic, cspsfonts, arabtex (<= 3.10-5)
+Conflicts: texidoc, bibtex, texpsfnt, mfbasfnt, xdvik, mfnfss, texlib, mflib, textfm, kpathsea, latex2e-doc, ltxgraph, csplain, cslatex, cstexfonts, tetex-bin (<= 2.0.2-13), xbase (<< 3.3.2.3a-2), tetex-nonfree (<< 1.0.2+20000804-2), pxfonts, txfonts, mfpic, cspsfonts, arabtex (<= 3.10-5)
Recommends: tetex-doc (>> 2.0)
Suggests: tetex-extra
Description: Basic library files of teTeX
@@ -26,7 +26,7 @@
Pre-Depends: dpkg (>=1.6.8)
Conflicts: kpathsea, texlib, textfm, bibtex, texpsfnt, mfbasfnt, mfnfss, xdvik, amsfonts, amstex, amslatex, ltxmisc, ltxtool, psnfss, mfdcfnt, mflib, pandora, hyperref, tetex-french, cspsfonts, tetex-nonfree, pb-diagram, revtex4 (<= 4.0-2), tetex-eurosym, tetex-base (<< 2.0.2-7)
Replaces: kpathsea, texlib, textfm, latex, bibtex, texidoc, texpsfnt, mfbasfnt, mfnfss, xdvik, amsfonts, amstex, amslatex, ltxmisc, ltxtool, psnfss, mfdcfnt, mflib, pandora, hyperref, cspsfonts, tetex-bin (<< 1.0.7+20021025-3), tetex-french, tetex-nonfree, pb-diagram, tetex-eurosym, tetex-base (<= 1.0.2+20011202-4)
-Depends: tetex-base (>= 2.0.2-7), tetex-bin (>> 2.0.2-3), gsfonts, ucf (>= 1.02)
+Depends: tetex-base (>= 2.0.2-7), tetex-bin (>> 2.0.2-13), gsfonts, ucf (>= 1.02)
Provides: tetex-nonfree, pb-diagram, tetex-eurosym
Description: Additional library files of teTeX
This package contains some additional parts of teTeX that some users
diff --exclude=*.po --exclude=*.pot --exclude=CVS -Nur tetex-base-2.0.2-CVS/debian/patches/patch-deb tetex-base-CVS/debian/patches/patch-deb
--- tetex-base-2.0.2-CVS/debian/patches/patch-deb Thu May 6 13:24:08 2004
+++ tetex-base-CVS/debian/patches/patch-deb Mon May 10 11:11:26 2004
@@ -126,3 +126,75 @@
omseco OmegaSerifCommon <omseco.pfb
omsecob OmegaSerifCommon-Bold <omsecob.pfb
omsecoi OmegaSerifCommon-Italic <omsecoi.pfb
+--- texmf/context/perltk/texfind.pl.orig Mon May 10 11:08:19 2004
++++ texmf/context/perltk/texfind.pl Mon May 10 11:10:46 2004
+@@ -20,13 +20,36 @@
+ use Getopt::Long ;
+ use File::Find ;
+ use Cwd ;
+-use Tk ;
+-use Tk::widgets ;
++#use Tk ;
++#use Tk::widgets ;
+ use Tk::ROText ;
+
+ use FindBin ;
+ use lib $FindBin::Bin ;
+ use path_tre ;
++
++# patched by Debian
++use File::Basename;
++BEGIN {
++ eval { require Tk; import Tk; };
++ if ($@) {
++ my $progname = basename($0);
++ my $message;
++ if ($@ =~ /^Can\'t locate Tk\.pm/) {
++ $message = "$progname: you must have the perl-tk package installed\nto use this script\n";
++ } else {
++ $message = "$progname: problem loading the Tk module:\n $@\nHave you installed the perl-tk package?\n";
++ }
++
++ if (! -t STDOUT and exists $ENV{DISPLAY})
++ {
++ exec("texdoctk-warn", $message);
++ } else {
++ die $message;
++ }
++ }
++}
++use Tk::widgets ;
+
+ my $FileSuffix = 'tex' ;
+ my $SearchString = '' ;
+--- texmf/context/perltk/texshow.pl.orig Mon May 10 11:08:15 2004
++++ texmf/context/perltk/texshow.pl Mon May 10 11:10:39 2004
+@@ -56,7 +56,27 @@
+ use cont_mis ;
+ use cont_set ;
+
+-use Tk ;
++# patched by Debian
++use File::Basename;
++BEGIN {
++ eval { require Tk; import Tk; };
++ if ($@) {
++ my $progname = basename($0);
++ my $message;
++ if ($@ =~ /^Can\'t locate Tk\.pm/) {
++ $message = "$progname: you must have the perl-tk package installed\nto use this script\n";
++ } else {
++ $message = "$progname: problem loading the Tk module:\n $@\nHave you installed the perl-tk package?\n";
++ }
++
++ if (! -t STDOUT and exists $ENV{DISPLAY})
++ {
++ exec("texdoctk-warn", $message);
++ } else {
++ die $message;
++ }
++ }
++}
+
+ #D This scripts is rather simple, because most of the action
+ #D takes place in the module \type {cont_set.pm}.
diff --exclude=*.po --exclude=*.pot --exclude=CVS -Nur tetex-base-2.0.2-CVS/debian/remove-bad-license-files tetex-base-CVS/debian/remove-bad-license-files
--- tetex-base-2.0.2-CVS/debian/remove-bad-license-files Thu Apr 3 18:47:48 2003
+++ tetex-base-CVS/debian/remove-bad-license-files Wed May 5 11:09:57 2004
@@ -4,7 +4,7 @@
#
## C.M. Connelly <cmc@debian.org>
#
-## $Id: remove-bad-license-files,v 1.10 2003/04/03 16:47:48 cmc Exp $
+## $Id: remove-bad-license-files,v 1.1.4.2 2004/05/05 09:09:57 frank Exp $
#
## Remove files that Debian can't distribute from the source tree if
## they are still present. (If the package is built with
diff --exclude=*.po --exclude=*.pot --exclude=CVS -Nur tetex-base-2.0.2-CVS/debian/remove-oldmaps tetex-base-CVS/debian/remove-oldmaps
--- tetex-base-2.0.2-CVS/debian/remove-oldmaps Thu Jan 1 01:00:00 1970
+++ tetex-base-CVS/debian/remove-oldmaps Mon May 10 17:35:08 2004
@@ -0,0 +1,64 @@
+#!/bin/sh
+#
+# Script to remove unused conffiles from /etc/texmf/dvips
+#
+# In previous version, font map files were treated as configuration
+# files by the teTeX packages and therefore installed in /etc/texmf. In
+# fact, however, these files hardly ever need to be edited. (Indeed it
+# is much more likely that there is an error in the *.sty or *fd
+# files). Therefore, these files are now installed in the usual TEXMF
+# tree.
+#
+# Since they formally were conffiles previously, dpkg treats them
+# specially: They will not be altered or removed when the package is
+# updated. The purpose of this is to keep any local configuration
+# changes - even if the files are no longer used, the changes therein
+# can be taken as a model for new changes elsewhere. In our case,
+# however, it also results in lots of unused files that probably were
+# never changed.
+#
+# If you want, you can remove these files - it will not affect tetex's
+# behavior at all. You can do this manually, or let this script do the
+# work for you. When working manually, not that there are still some
+# files left in /etc/texmf/dvips: Files with other extensions than "map"
+# as well as map files from other packages.
+#
+
+DVIPS=/etc/texmf/dvips
+
+ANTP="config.antp antp.map antp.enc"
+ANTT="config.antt antt.map antt.enc"
+BLUESKY="psfonts.ams psfonts.cm psfonts.amz psfonts.cmz"
+CCPL="ccpl.map"
+LUCIDA="lucidabr-k.map lucidabr.map lumath-k.map lumath.map"
+PSNFSS="charter.map pazo.map psnfss.map"
+MISC="cmcyr.map mathpi.map cs.map config.mirr marvosym.map pcrr8rn.map wolfram.map"
+EXTRAMISC="eurosym.map"
+TETEX="config.outline hoekwater.map mt-yy.map txfonts.map config.dfaxhigh \
+ config.pdf lucidabr-o.map pdftex35.map config.dfaxlo config.pk mathpple.map \
+ ps2pk35.map config.download35 config.www mt-belleek.map pxfonts.map \
+ config.gsftopk dvips35.map mt-plus.map ttcmex.map dvipdfm35.map lumath-o.map"
+PL="config.pl pl.map"
+QFNT="config.qbk config.qpl config.qzc config.qcr config.qhv config.qtm qbk.map qcr.map qhv.map qpl.map qtm.map qzc.map"
+XYPIC="xypic.map"
+
+OMEGA_UCF="omega.map"
+BSRTETEX_UCF="bsr-interpolated.map bsr.map"
+
+
+generated="download35.map builtin35.map psfonts_t1.map psfonts_pk.map pdftex_dl14.map pdftex_ndl14.map dvipdfm_dl14.map dvipdfm_ndl14.map ps2pk.map"
+
+generated_links="dvipdfm.map pdftex.map psfonts.map"
+
+for oldmap in $ANTP $ANTT $BLUESKY $CCPL $LUCIDA $PSNFSS \
+ $MISC $EXTRAMISC $TETEX $PL $QFNT $XYPIC $OMEGA_UCF $BSRTETEX_UCF \
+ $generated; do
+ file=$DVIPS/$oldmap
+ if [ -e $file -a ! -L $file ]; then rm $file; fi
+done
+
+for oldlink in $generated_links; do
+ file=$DVIPS/$oldlink
+ if [ -L $file -a ! -f "`readlink $file`" ]; then rm $file; fi
+done
+
diff --exclude=*.po --exclude=*.pot --exclude=CVS -Nur tetex-base-2.0.2-CVS/debian/rules tetex-base-CVS/debian/rules
--- tetex-base-2.0.2-CVS/debian/rules Wed Apr 28 15:47:48 2004
+++ tetex-base-CVS/debian/rules Mon May 10 17:41:23 2004
@@ -5,7 +5,7 @@
# Heavily updated to take advantage of debhelper
# by C.M. Connelly <cmc@debian.org> on 2002 April 27.
-# $Id: rules,v 1.43 2004/04/28 13:47:48 frank Exp $
+# $Id: rules,v 1.1.4.9 2004/05/10 15:41:23 frank Exp $
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -241,7 +241,7 @@
# link to one in /var/lib/texmf that we can update without violating
# the FHS.
rm -f $(txmfdir)/ls-R
- (cd $(txmfdir); ln -s /var/lib/texmf/ls-R .)
+ (cd $(txmfdir); ln -s /var/lib/texmf/ls-R-TEXMFMAIN ls-R)
# xdvi.cfg was moved from tetex-bin to tetex-base (since 20021025). But,
# moved tetex-bin again (and removed from upstream tetex-base) since teTeX 2.0
@@ -249,7 +249,7 @@
# rm -f $(txmfdir)/xdvi/xdvi.cfg
# setup conffiles
- debian/setup-maps -base
+ #debian/setup-maps -base
debian/setup-conffiles -base
# removed generated files
for m in "$(generated)"; do mv debian/$(package)/etc/texmf/dvips/$$m \
@@ -314,7 +314,7 @@
# Install documentation (also creates /usr/share/doc/<package>
# directories).
- dh_installdocs -i
+ dh_installdocs -i debian/remove-oldmaps
# Remove the /usr/share/doc/{tetex-extra,tetex-doc} directories and
# replace them with links to the /usr/share/doc/tetex-base directory
@@ -324,7 +324,7 @@
(cd debian/$(extra)/usr/share/doc/; ln -s tetex-base tetex-extra)
(cd debian/$(docpack)/usr/share/doc/; ln -s tetex-base tetex-doc)
# Install any example files.
-# dh_installexamples -i
+# dh_installexamples -i
# Install upstream changelog.
dh_installchangelogs texmf/ChangeLog -p tetex-base
diff --exclude=*.po --exclude=*.pot --exclude=CVS -Nur tetex-base-2.0.2-CVS/debian/setup-maps tetex-base-CVS/debian/setup-maps
--- tetex-base-2.0.2-CVS/debian/setup-maps Sat May 8 16:30:52 2004
+++ tetex-base-CVS/debian/setup-maps Mon May 10 17:25:28 2004
@@ -1,195 +1,30 @@
#!/bin/sh
DVIPS=/etc/texmf/dvips
-TXMFD=debian/tetex-base/usr/share/texmf/dvips
-ETC=debian/tetex-base${DVIPS}
EXTD=debian/tetex-extra/usr/share/texmf/dvips
-EXETC=debian/tetex-extra${DVIPS}
EXUCF=debian/tetex-extra/usr/share/tetex-extra
###
# part of these is now handled by ucf!
BLUESKY_UCF="config.ams config.cm config.amz config.cmz"
-OMEGA_UCF="omega.map"
-BSRTETEX_UCF="bsr-interpolated.map bsr.map"
###
-ANTP="config.antp antp.map antp.enc"
-ANTT="config.antt antt.map antt.enc"
-BLUESKY="psfonts.ams psfonts.cm psfonts.amz psfonts.cmz"
-#BSRTETEX="bsr-interpolated.map bsr.map"
-CCPL="ccpl.map"
-LUCIDA="lucidabr-k.map lucidabr.map lumath-k.map lumath.map"
-PSNFSS="charter.map pazo.map psnfss.map"
-MISC="cmcyr.map mathpi.map cs.map config.mirr marvosym.map pcrr8rn.map wolfram.map"
-EXTRAMISC="eurosym.map"
-TETEX="config.outline hoekwater.map mt-yy.map txfonts.map config.dfaxhigh config.pdf lucidabr-o.map pdftex35.map config.dfaxlo config.pk mathpple.map ps2pk35.map config.download35 config.www mt-belleek.map pxfonts.map config.gsftopk dvips35.map mt-plus.map ttcmex.map dvipdfm35.map lumath-o.map"
-PL="config.pl pl.map"
-QFNT="config.qbk config.qpl config.qzc config.qcr config.qhv config.qtm qbk.map qcr.map qhv.map qpl.map qtm.map qzc.map"
-XYPIC="xypic.map"
-
if [ x"$1" = "x-base" ] ; then
-
-for f in ${ANTP}
-do
-if [ -f ${TXMFD}/antp/${f} ]; then
-mv -i ${TXMFD}/antp/${f} ${ETC}
-(cd ${TXMFD}/antp ; ln -s ${DVIPS}/${f} .)
-else
-echo "*** ${TXMFD}/antp/${f} doesn't exist!"
-fi
-done
-
-for f in ${ANTT}
-do
-if [ -f ${TXMFD}/antt/${f} ]; then
-mv -i ${TXMFD}/antt/${f} ${ETC}
-(cd ${TXMFD}/antt ; ln -s ${DVIPS}/${f} .)
-else
-echo "*** ${TXMFD}/antt/${f} doesn't exist!"
-fi
-done
-
-for f in ${CCPL}
-do
-if [ -f ${TXMFD}/cc-pl/${f} ]; then
-mv -i ${TXMFD}/cc-pl/${f} ${ETC}
-(cd ${TXMFD}/cc-pl ; ln -s ${DVIPS}/${f} .)
-else
-echo "*** ${TXMFD}/cc-pl/${f} doesn't exist!"
-fi
-done
-
-for f in ${PSNFSS}
-do
-if [ -f ${TXMFD}/psnfss/${f} ]; then
-mv -i ${TXMFD}/psnfss/${f} ${ETC}
-(cd ${TXMFD}/psnfss ; ln -s ${DVIPS}/${f} .)
-else
-echo "*** ${TXMFD}/psnfss/${f} doesn't exist!"
-fi
-done
-
-for f in ${MISC}
-do
-if [ -f ${TXMFD}/misc/${f} ]; then
-mv -i ${TXMFD}/misc/${f} ${ETC}
-(cd ${TXMFD}/misc ; ln -s ${DVIPS}/${f} .)
-else
-echo "*** ${TXMFD}/misc/${f} doesn't exist!"
-fi
-done
-
-for f in ${LUCIDA}
-do
-if [ -f ${TXMFD}/lucida/${f} ]; then
-mv -i ${TXMFD}/lucida/${f} ${ETC}
-(cd ${TXMFD}/lucida ; ln -s ${DVIPS}/${f} .)
-else
-echo "*** ${TXMFD}/lucida/${f} doesn't exist!"
-fi
-done
-
-for f in ${TETEX}
-do
-if [ -f ${TXMFD}/tetex/${f} ]; then
-mv -i ${TXMFD}/tetex/${f} ${ETC}
-(cd ${TXMFD}/tetex ; ln -s ${DVIPS}/${f} .)
-else
-echo "*** ${TXMFD}/tetex/${f} doesn't exist!"
-fi
-done
-
-for f in ${PL}
-do
-if [ -f ${TXMFD}/pl/${f} ]; then
-mv -i ${TXMFD}/pl/${f} ${ETC}
-(cd ${TXMFD}/pl ; ln -s ${DVIPS}/${f} .)
-else
-echo "*** ${TXMFD}/pl/${f} doesn't exist!"
-fi
-done
-
-for f in ${QFNT}
-do
-if [ -f ${TXMFD}/qfonts/${f} ]; then
-mv -i ${TXMFD}/qfonts/${f} ${ETC}
-(cd ${TXMFD}/qfonts ; ln -s ${DVIPS}/${f} .)
-else
-echo "*** ${TXMFD}/qfonts/${f} doesn't exist!"
-fi
-done
-
+ echo "nothing to be done for tetex-base"
elif [ x"$1" = "x-extra" ] ; then
-# tetex-extra stuffs
-install -d ${EXETC}
-
-for f in ${BLUESKY}
-do
-if [ -f ${EXTD}/bluesky/${f} ]; then
-mv -i ${EXTD}/bluesky/${f} ${EXETC}
-(cd ${EXTD}/bluesky ; ln -s ${DVIPS}/${f} .)
-else
-echo "*** ${EXTD}/bluesky/${f} doesn't exist!"
-fi
-done
-
-for f in ${OMEGA_UCF}
-do
-if [ -f ${EXTD}/omega/${f} ]; then
-mv -i ${EXTD}/omega/${f} ${EXUCF}
-(cd ${EXTD}/omega ; ln -s ${DVIPS}/${f} .)
-cp debian/md5sums/${f}.md5sum ${EXUCF}
-else
-echo "*** ${EXTD}/omega/${f} doesn't exist!"
-fi
-done
-
# ucf
-for f in ${BLUESKY_UCF}
-do
-if [ -f ${EXTD}/bluesky/${f} ]; then
-mv -i ${EXTD}/bluesky/${f} ${EXUCF}
-(cd ${EXTD}/bluesky ; ln -s ${DVIPS}/${f} .)
-cp debian/md5sums/${f}.md5sum ${EXUCF}
-else
-echo "*** ${EXTD}/bluesky/${f} doesn't exist!"
-fi
-done
-
-# ucf
-for f in ${BSRTETEX_UCF}
-do
-if [ -f ${TXMFD}/tetex/${f} ]; then
-mv -i ${TXMFD}/tetex/${f} ${EXUCF}
-(cd ${EXTD}/tetex ; ln -s ${DVIPS}/${f} .)
-cp debian/md5sums/${f}.md5sum ${EXUCF}
-else
-echo "*** ${TXMFD}/tetex/${f} doesn't exist!"
-fi
-done
-
-for f in ${EXTRAMISC}
-do
-if [ -f ${EXTD}/misc/${f} ]; then
-mv -i ${EXTD}/misc/${f} ${EXETC}
-(cd ${EXTD}/misc ; ln -s ${DVIPS}/${f} .)
-else
-echo "*** ${EXTD}/misc/${f} doesn't exist!"
-fi
-done
-
-for f in ${XYPIC}
-do
-if [ -f ${EXTD}/xypic/${f} ]; then
-mv -i ${EXTD}/xypic/${f} ${EXETC}
-(cd ${EXTD}/xypic ; ln -s ${DVIPS}/${f} .)
-else
-echo "*** ${EXTD}/xypic/${f} doesn't exist!"
-fi
-done
+ for f in ${BLUESKY_UCF}
+ do
+ if [ -f ${EXTD}/bluesky/${f} ]; then
+ mv -i ${EXTD}/bluesky/${f} ${EXUCF}
+ (cd ${EXTD}/bluesky ; ln -s ${DVIPS}/${f} .)
+ cp debian/md5sums/${f}.md5sum ${EXUCF}
+ else
+ echo "*** ${EXTD}/bluesky/${f} doesn't exist!"
+ fi
+ done
else
-echo "Bad usage!"
-exit 1
+ echo "Bad usage!"
+ exit 1
fi
diff --exclude=CVS -Nur tetex-bin-2.0.2-CVS/debian/changelog tetex-bin-CVS/debian/changelog
--- tetex-bin-2.0.2-CVS/debian/changelog Fri May 7 17:47:31 2004
+++ tetex-bin-CVS/debian/changelog Mon May 10 19:19:14 2004
@@ -1,4 +1,4 @@
-tetex-bin (2.0.2-15) unstable; urgency=low
+tetex-bin (2.0.2-14.32) unstable; urgency=low
* Apply patch for overlong line generated by update-texmf (closes:
#246882) [frank and jdg]
@@ -8,8 +8,13 @@
Hilmar. [frank]
* Patch mkind.h so that makeindex displays correct options (closes:
#247654) [frank]
+ * Patch mkind.h so that makeindex displays correct options (closes:
+ #247654) [frank]
+ * Ship the language.dat symlink in the deb file, instead of creating it
+ in postinst (closes: #247414) [frank]
+ * testing VARTEMXF
- -- Frank Küster <frank@debian.org> Fri, 7 May 2004 17:47:31 +0200
+ -- Frank Küster <frank@debian.org> Mon, 10 May 2004 14:54:50 +0200
tetex-bin (2.0.2-14) unstable; urgency=medium
diff --exclude=CVS -Nur tetex-bin-2.0.2-CVS/debian/control tetex-bin-CVS/debian/control
--- tetex-bin-2.0.2-CVS/debian/control Tue Apr 20 15:49:12 2004
+++ tetex-bin-CVS/debian/control Mon May 10 18:04:26 2004
@@ -13,7 +13,7 @@
Conflicts: texbin, xdvik, mflib, kpathsea, makeindex, ps2pk, latex, nextawg (<= 0.5.1-34), nextaw (<< 0.8-2), alml (<< 2002.08.29-4), jbibtex-bin (<< 3.0.5+0.04-2), jtex-bin (<= 1.8-5.1), passivetex (<< 1.21-5), ptex-bin (<< 3.0.5+0.04-2), xmltex (<< 1.9-4), cweb, tetex-base (<< 2.0.2-6)
Provides: tex, latex, dvips, dvipsk, xdvi, metafont, dvipdfm, cweb, texdoctk
Pre-Depends: dpkg (>= 1.6.8)
-Depends: ${shlibs:Depends}, ${perl:Depends}, tetex-base (>> 2.0.2-5.1), ed, debianutils (>= 1.13.1), debconf (>= 0.5.00), mime-support, sed (>= 4.0.5), ucf (>= 1.02)
+Depends: ${shlibs:Depends}, ${perl:Depends}, tetex-base (>> 2.0.2-8), ed, debianutils (>= 1.13.1), debconf (>= 0.5.00), mime-support, sed (>= 4.0.5), ucf (>= 1.02)
Suggests: lpr, postscript-viewer, pdf-viewer, tetex-extra, texinfo
Recommends: dialog | whiptail, psutils, texi2html, perl-tk
Description: The teTeX binary files
diff --exclude=CVS -Nur tetex-bin-2.0.2-CVS/debian/dirs tetex-bin-CVS/debian/dirs
--- tetex-bin-2.0.2-CVS/debian/dirs Sat Mar 20 08:32:54 2004
+++ tetex-bin-CVS/debian/dirs Sat May 8 17:28:51 2004
@@ -5,3 +5,5 @@
etc/texmf/texmf.d
var/lib/texmf
usr/share/tetex-bin
+usr/share/texmf/tex/generic/config/
+
diff --exclude=CVS -Nur tetex-bin-2.0.2-CVS/debian/postinst tetex-bin-CVS/debian/postinst
--- tetex-bin-2.0.2-CVS/debian/postinst Tue Apr 13 17:58:22 2004
+++ tetex-bin-CVS/debian/postinst Sat May 8 18:47:32 2004
@@ -537,8 +537,8 @@
mv -f ${LDATD}/language.dat ${LDATD}/language.dat.$MOVE_EXT
fi
fi
-# now make the link. We do this without a further check, if it was
-(cd ${LDATD} ; ln -s ${LDAT} .)
+# now make the link. (Now installed in the deb 2004-05-08, frank)
+#(cd ${LDATD} ; ln -s ${LDAT} .)
###########################################
# end of handling of language.dat
diff --exclude=CVS -Nur tetex-bin-2.0.2-CVS/debian/rules tetex-bin-CVS/debian/rules
--- tetex-bin-2.0.2-CVS/debian/rules Fri May 7 17:38:21 2004
+++ tetex-bin-CVS/debian/rules Sat May 8 17:28:29 2004
@@ -188,6 +188,8 @@
cp debian/update-updmap.8 $(sharedir)/man/man8/
#the warning for texdoctk
install debian/texdoctk-warn debian/$(package)/usr/bin
+# install language.dat link in the deb, don't create it in postinst
+ (cd $(txmfdir)/tex/generic/config/; ln -s /etc/texmf/language.dat .)
#libkpathsea-dev installer
mkdir -p debian/$(subdev)/usr/share/doc
Reply to: