Bug#213310: omega.map, all map files, and generated map files
Frank Küster <frank@debian.org> wrote:
> In the tetex-bin patch there's a drastic thinko. I don't have time right
> now to provide a correct patch, therefore only text: You need to delete
> the lines in tetex-bin's postinst where the language.dat link is
> unconditionally removed, just before the lines where I deleted the link
> creation.
Here's the corrected patch.
Corrections:
- remove the lines from postinst that broke the last patch
- patch texconfig to not put its files into /var/lib/texmf
Regards, Frank
diff --exclude=*.pot --exclude=*.po --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 Fri May 14 18:45:11 2004
@@ -1,4 +1,4 @@
-tetex-bin (2.0.2-15) unstable; urgency=low
+tetex-bin (2.0.2-14.35) unstable; urgency=low
* Apply patch for overlong line generated by update-texmf (closes:
#246882) [frank and jdg]
@@ -8,8 +8,14 @@
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. However, because of dpkg's bug 213357 we still have to
+ check for its existense 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=*.pot --exclude=*.po --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=*.pot --exclude=*.po --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=*.pot --exclude=*.po --exclude=CVS -Nur tetex-bin-2.0.2-CVS/debian/patches/patch-deb tetex-bin-CVS/debian/patches/patch-deb
--- tetex-bin-2.0.2-CVS/debian/patches/patch-deb Fri Apr 23 13:57:16 2004
+++ tetex-bin-CVS/debian/patches/patch-deb Wed May 12 17:38:41 2004
@@ -488,3 +488,19 @@
Web page: \fI<http://tug\&.cs\&.umb\&.edu/tetex/>\fP
.PP
+--- tetex-bin-CVS/texk/tetex/texconfig.orig Wed May 12 17:36:38 2004
++++ tetex-bin-CVS/texk/tetex/texconfig Wed May 12 17:37:57 2004
+@@ -1777,8 +1777,11 @@
+ test -z "$TC_MKTEXNAM" && TC_MKTEXNAM="$TC_TEXMFMAIN/web2c/mktexnam"
+
+ # The texmf tree where we put generated files into. Defaults to system tree:
+-: ${TC_VARTEXMF=`kpsewhich -expand-var='$VARTEXMF'`}
+-test -z "$TC_VARTEXMF" && TC_VARTEXMF=$TC_TEXMFMAIN
++# : ${TC_VARTEXMF=`kpsewhich -expand-var='$VARTEXMF'`}
++# test -z "$TC_VARTEXMF" && TC_VARTEXMF=$TC_TEXMFMAIN
++# Debian uses the system tree - there should be a link to /etc/texmf/
++# for every file texconfig acts on:
++TC_VARTEXMF=$TC_TEXMFMAIN
+
+ : ${TC_DFT_XDVI_APP=`XDVIINPUTS="$XDVIINPUTS":'$TEXMF/{xdvi,web2c}' kpsewhich -progname=xdvi --format='other text files' XDvi`}
+ test -z "$TC_DFT_XDVI_APP" && TC_DFT_XDVI_APP="$TC_TEXMFMAIN/xdvi/XDvi"
diff --exclude=*.pot --exclude=*.po --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 Fri May 14 18:50:32 2004
@@ -188,6 +188,7 @@
# handling of language.dat
###########################################
+
# first some helper function. The real action begins at the next db_get.
uncomment_ldat(){
pattern="$1"
@@ -525,20 +526,8 @@
fi
fi
# with or without debconf managment of language.dat, we have to make the link
-#
-# Check whether it is yet there
-if [ -L ${LDATD}/language.dat ]; then
- # remove it (no need to check whether it is yet correct, it's
- # simpler this way)
- rm ${LDATD}/language.dat
-else
- # is there a file language.dat where we want the link to be?
- if [ -f ${LDATD}/language.dat ]; then
- 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 installed in the deb 2004-05-08, frank)
+#(cd ${LDATD} ; ln -s ${LDAT} .)
###########################################
# end of handling of language.dat
diff --exclude=*.pot --exclude=*.po --exclude=CVS -Nur tetex-bin-2.0.2-CVS/debian/postrm tetex-bin-CVS/debian/postrm
--- tetex-bin-2.0.2-CVS/debian/postrm Wed Apr 14 13:25:48 2004
+++ tetex-bin-CVS/debian/postrm Thu May 13 17:39:44 2004
@@ -31,7 +31,7 @@
# purge texmf.cnf which is generated by update-texmf using ucf:
purge_ucf_file ${TEXMFC}
- rm -f ${FMTCNF}* ${VLDAT}*
+ rm -f ${FMTCNF}* #${VLDAT}*
# rm -rf ${TEXMFD} ## this could delete configuration files of other packages
# rm -rf ${FMTD} ## this could delete configuration files of other packages
rm -rf /var/lib/texmf/web2c
diff --exclude=*.pot --exclude=*.po --exclude=CVS -Nur tetex-bin-2.0.2-CVS/debian/rules tetex-bin-CVS/debian/rules
--- tetex-bin-2.0.2-CVS/debian/rules Tue May 11 20:58:33 2004
+++ tetex-bin-CVS/debian/rules Tue May 11 20:58:02 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
--
Frank Küster, Biozentrum der Univ. Basel
Abt. Biophysikalische Chemie
Reply to: