[Debian-tex-commits] SVN tex-common commit + diffs: r4226 - in tex-common/branches/for-tl2008: debian doc scripts
Norbert Preining
preining at alioth.debian.org
Sat Oct 3 12:05:12 UTC 2009
Author: preining
Date: 2009-10-03 12:04:54 +0000 (Sat, 03 Oct 2009)
New Revision: 4226
Modified:
tex-common/branches/for-tl2008/debian/changelog
tex-common/branches/for-tl2008/debian/postinst.in
tex-common/branches/for-tl2008/debian/postrm.in
tex-common/branches/for-tl2008/doc/Debian-TeX-Policy.pdf
tex-common/branches/for-tl2008/doc/TeX-on-Debian.pdf
tex-common/branches/for-tl2008/scripts/postrm-tex
tex-common/branches/for-tl2008/scripts/update-fontlang
Log:
merge changes between 1.18 and 1.20 into this branch
update changelog
moerge the experimental changelog entries into one
update pdfs
Modified: tex-common/branches/for-tl2008/debian/changelog
===================================================================
--- tex-common/branches/for-tl2008/debian/changelog 2009-09-30 10:08:54 UTC (rev 4225)
+++ tex-common/branches/for-tl2008/debian/changelog 2009-10-03 12:04:54 UTC (rev 4226)
@@ -1,6 +1,12 @@
-tex-common (2.01~7) experimental; urgency=low
+tex-common (2.00) experimental; urgency=low
- [ Frank Küster ]
+ * new experimental branch for changes necessary to support TeX Live 2008
+ and later that introduced hyphenation pattern support for etex based
+ formats. language.def is now managed like language.dat.
+ - add support for generating language.def to update-fontlang
+ - install those scripts as update-language-def and update-language-dat
+ - make update-language work as calling both of the above
+ - adjust dh_installtex to accept new syntax
* Make the wording of the warning message in postrm-texlsr broader,
since there are a couple of reasons why this can fail
* Update some texmf.cnf settings for TeXLive 2009. Before uploading to
@@ -9,20 +15,34 @@
* Add a Conflicts on old texlive-common, in order to force an upgrade of
all the packages in one bunch.
- -- Frank Küster <frank at debian.org> Sun, 27 Sep 2009 21:19:12 +0200
+ -- Norbert Preining <preining at debian.org> Sun, 10 May 2009 16:03:38 +0200
-tex-common (2.00) experimental; urgency=low
+tex-common (1.20) unstable; urgency=low
- * new experimental branch for changes necessary to support TeX Live 2008
- and later that introduced hyphenation pattern support for etex based
- formats. language.def is now managed like language.dat.
- - add support for generating language.def to update-fontlang
- - install those scripts as update-language-def and update-language-dat
- - make update-language work as calling both of the above
- - adjust dh_installtex to accept new syntax
+ * after the change to tex-common's postinst script the ls-R file for
+ /var/lib/texmf was not recreated, which breaks installation.
+ Add this tree to the trigger call to mktexlsr (Closes: #532525)
- -- Norbert Preining <preining at debian.org> Sun, 10 May 2009 16:03:38 +0200
+ -- Norbert Preining <preining at debian.org> Tue, 09 Jun 2009 22:37:03 +0200
+tex-common (1.19) unstable; urgency=low
+
+ [ Norbert Preining ]
+ * change dh_installtex generated postrm code to call update-texmf-config
+ only if it is present. That should be due to the policy, but it still
+ might happen that tex-common is not installed bug another package
+ depending on it is tried to be removed (see bug #531581).
+ (Closes: #530832)
+ * Remove the code in postrm that removes /usr/local/share/texmf/ls-R,
+ we are not allowed to do that (policy), but we try to remove that
+ directory if it is empty. (Closes: #528021)
+
+ [ Frank Küster ]
+ * Make sure that tex-common's own postinst script does not create
+ /usr/local/share/texmf/ls-R (closes: #528021)
+
+ -- Frank Küster <frank at debian.org> Sun, 07 Jun 2009 21:53:07 +0200
+
tex-common (1.18) unstable; urgency=low
* make sure that fmtutil-sys --all and updmap-sys are called on new
Modified: tex-common/branches/for-tl2008/debian/postinst.in
===================================================================
--- tex-common/branches/for-tl2008/debian/postinst.in 2009-09-30 10:08:54 UTC (rev 4225)
+++ tex-common/branches/for-tl2008/debian/postinst.in 2009-10-03 12:04:54 UTC (rev 4226)
@@ -51,7 +51,7 @@
if which mktexlsr >/dev/null; then
tempfile=$(mktemp -p /tmp mktexlsr.XXXXXXXX)
printf "Running mktexlsr. This may take some time... "
- if mktexlsr > $tempfile 2>&1 ; then
+ if mktexlsr /usr/share/texmf/ /usr/share/texmf-texlive/ /var/lib/texmf/ > $tempfile 2>&1 ; then
rm -f $tempfile
echo "done."
else
Modified: tex-common/branches/for-tl2008/debian/postrm.in
===================================================================
--- tex-common/branches/for-tl2008/debian/postrm.in 2009-09-30 10:08:54 UTC (rev 4225)
+++ tex-common/branches/for-tl2008/debian/postrm.in 2009-10-03 12:04:54 UTC (rev 4226)
@@ -35,8 +35,13 @@
# purge texmf.cnf which is generated by update-texmf using ucf:
purge_ucf_file /etc/texmf/texmf.cnf
- # remove the symlink in TEXMFLOCAL
- rm -f /usr/local/share/texmf/ls-R 2>/dev/null || true
+ # try to remove /usr/local/share/texmf if it is empty
+ # people should normally not have TEXMFLOCAL ls-R files
+ # unless they called mktexlsr manually, in which case this is fine
+ # maintainer scripts should call mktexlsr with a list of trees so
+ # no /u/l/s/texmf/ls-R is created
+ #rm -f /usr/local/share/texmf/ls-R 2>/dev/null || true
+ rmdir --ignore-fail-on-non-empty /usr/local/share/texmf/ 2>/dev/null || true
;;
*)
;;
Modified: tex-common/branches/for-tl2008/doc/Debian-TeX-Policy.pdf
===================================================================
(Binary files differ)
Modified: tex-common/branches/for-tl2008/doc/TeX-on-Debian.pdf
===================================================================
(Binary files differ)
Modified: tex-common/branches/for-tl2008/scripts/postrm-tex
===================================================================
--- tex-common/branches/for-tl2008/scripts/postrm-tex 2009-09-30 10:08:54 UTC (rev 4225)
+++ tex-common/branches/for-tl2008/scripts/postrm-tex 2009-10-03 12:04:54 UTC (rev 4226)
@@ -50,7 +50,15 @@
remove|disappear)
for i in #WHATTODO# ; do
if [ "$i" = map ] ; then
- update-texmf-config updmap
+ # it might happen that tex-common is not installed and
+ # still the postrm of a package is tried to be uninstalled
+ # so don't call update-texmf-config if not present
+ # See bug report #531581
+ if which update-texmf-config >/dev/null; then
+ update-texmf-config updmap
+ else
+ echo "update-texmf-config not present: is tex-common installed?" >&2
+ fi
#dhit_libkpathsea_configured && \
# dhit_check_run_without_errors updmap-sys
fi
@@ -65,8 +73,12 @@
rm -f /var/lib/texmf/web2c/$fmt.*
done
fi
- if [ "$i" = language ] ; then
- update-texmf-config language
+ if [ "$i" = hyphen ] ; then
+ if which update-texmf-config >/dev/null; then
+ update-texmf-config language
+ else
+ echo "update-texmf-config not present: is tex-common installed?" >&2
+ fi
#if dhit_libkpathsea_configured && \
# which fmtutil-sys >/dev/null; then
# dhit_build_hyphen_format_if_format_exists \
Modified: tex-common/branches/for-tl2008/scripts/update-fontlang
===================================================================
--- tex-common/branches/for-tl2008/scripts/update-fontlang 2009-09-30 10:08:54 UTC (rev 4225)
+++ tex-common/branches/for-tl2008/scripts/update-fontlang 2009-10-03 12:04:54 UTC (rev 4226)
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
#
# update-fontlang --- Generate updmap.cfg, language.dat, fmtutil.cnf
# from a set of files
More information about the Debian-tex-commits
mailing list