[Debian-tex-commits] SVN tex-common commit + diffs: r5451 - in tex-common/trunk: debian doc scripts
Norbert Preining
preining at alioth.debian.org
Wed May 9 22:33:01 UTC 2012
Author: preining
Date: 2012-05-09 22:33:00 +0000 (Wed, 09 May 2012)
New Revision: 5451
Modified:
tex-common/trunk/debian/changelog
tex-common/trunk/doc/Debian-TeX-Policy.sgml
tex-common/trunk/doc/TeX-on-Debian.sgml
tex-common/trunk/scripts/update-fmtlang
Log:
remove references to teTeX in all relevant places (Closes: #511710)
Modified: tex-common/trunk/debian/changelog
===================================================================
--- tex-common/trunk/debian/changelog 2012-05-09 22:25:25 UTC (rev 5450)
+++ tex-common/trunk/debian/changelog 2012-05-09 22:33:00 UTC (rev 5451)
@@ -3,6 +3,7 @@
* don't break if texmf.cnf is already removed (Closes: #671610, #672269)
* ship a html redirect file as README.Debian.html instead of a link
so that hrefs work (Closes: #657677)
+ * remove references to teTeX in all relevant places (Closes: #511710)
-- Norbert Preining <preining at debian.org> Thu, 10 May 2012 07:11:07 +0900
Modified: tex-common/trunk/doc/Debian-TeX-Policy.sgml
===================================================================
--- tex-common/trunk/doc/Debian-TeX-Policy.sgml 2012-05-09 22:25:25 UTC (rev 5450)
+++ tex-common/trunk/doc/Debian-TeX-Policy.sgml 2012-05-09 22:33:00 UTC (rev 5451)
@@ -840,7 +840,7 @@
<file>/etc/texmf/updmap.d/20foo.cfg</file> will be ignored
by <prgn>update-updmap</prgn><footnote>An
<prgn>update-updmap</prgn> call could take place if another
- package such as <package>tetex-bin</package> is configured
+ package such as <package>texlive-*</package> is configured
in the meantime. That happens sometimes with APT.</footnote>
because it may be outdated. Eventually, <var>package</var>
is configured; <file><var>package</var>.postinst</file> runs
@@ -1232,15 +1232,15 @@
# The function name is *try_to*_update_fontmaps because the following
# scenario might happen:
# 1. this package is deconfigured
-# 2. tex-common and tetex-bin are removed
+# 2. tex-common and texlive-binaries are removed
# 3. this package is removed or purged
#
# (cf. Policy § 6.5, step 2, about a conflicting package being removed due
# to the installation of the package being discussed).
#
# In this case, update-updmap, mktexlsr and updmap-sys would all be gone once
-# tex-common and tetex-bin are removed, so we must append "|| true" to their
-# calls.
+# tex-common and texlive-binaries are removed, so we must append "|| true" to
+# their calls.
try_to_update_fontmaps()
{
# Don't print alarming error messages if the programs aren't even
Modified: tex-common/trunk/doc/TeX-on-Debian.sgml
===================================================================
--- tex-common/trunk/doc/TeX-on-Debian.sgml 2012-05-09 22:25:25 UTC (rev 5450)
+++ tex-common/trunk/doc/TeX-on-Debian.sgml 2012-05-09 22:33:00 UTC (rev 5451)
@@ -609,16 +609,6 @@
<sect>
<heading>Note on <prgn>dvipdfm</prgn></heading>
-<!--
- <p>
- In Debian teTeX packages, <prgn>dvipdfm</prgn> uses the settings in
- <file>/etc/papersize</file> to determine the default papersize. This
- only takes effect if the paper geometry is not set explicitly in the
- (La)TeX source, e.g. using the packages <tt>geometry</tt> or
- <tt>hyperref</tt>.
- </p>
--->
-
<p>
The Debian TeX Live packages do evaluate the
settings of <file>/etc/papersize</file>, please configure
@@ -966,22 +956,6 @@
ls /etc/texmf/texmf.d/*
</example>
</item>
-
- <item>
- If you see something like:
-
-<example>
-Unpacking replacement tetex-base ...
-dpkg: error processing /var/cache/../tetex-base_*_all.deb (--unpack): trying to overwrite `/usr/share/texmf/dvips/config', which is also in package foo
-</example>
-
- then the problem should be of package <package>foo</package>, not
- of <package>tetex-base</package>.
-
- <item>
- The Debian maintainers will not include anything in the TeX Live
- packages that is not already in TeX Live upstream.
- </item>
</list>
</p>
</chapt>
Modified: tex-common/trunk/scripts/update-fmtlang
===================================================================
--- tex-common/trunk/scripts/update-fmtlang 2012-05-09 22:25:25 UTC (rev 5450)
+++ tex-common/trunk/scripts/update-fmtlang 2012-05-09 22:33:00 UTC (rev 5451)
@@ -345,7 +345,7 @@
# handle_file <file path>
#
# <file path> must point to an update-fontlang configuration file (such as
-# /etc/texmf/updmap.d/05tetex-extra.cfg). The function decides whether the file
+# /etc/texmf/updmap.d/20lmodern.cfg). The function decides whether the file
# should be included in $output_file and outputs the corresponding snippet if
# yes, or a comment explaining why if no.
handle_file()
@@ -382,13 +382,13 @@
# merge_files
#
# This function expects on the standard input a sorted list of update-updmap
-# configuration files (such as /etc/texmf/updmap.d/05tetex-extra.cfg). Each of
+# configuration files (such as /etc/texmf/updmap.d/20lmodern.cfg). Each of
# them should be listed on a line by itself with the basename being the
# *first* component of the path, e.g.:
#
-# 05tetex-extra.cfg/etc/texmf/updmap.d
+# 20lmodern.cfg/etc/texmf/updmap.d
#
-# (where 05 should be at the beginning of the line, with no leading spaces, of
+# (where 20 should be at the beginning of the line, with no leading spaces, of
# course). This is so because the sort operation presumably performed by the
# caller of this function should sort on the basenames of the files,
# regardless of the directories they come from.
@@ -487,9 +487,9 @@
if [ -e "$badly_located_cfg_file" ]; then
printf "\
Error: '$badly_located_cfg_file' should not exist when using the
- Debian teTeX or TeX Live packages. Presumably, you used ${badly_used_prg}
+ Debian TeX Live packages. Presumably, you used ${badly_used_prg}
in maintainance mode (options ${bad_options}).
- This shouldn't be done with the Debian teTeX or TeX Live packages.
+ This shouldn't be done with the Debian TeX Live packages.
Instead, you should edit the files in ${SYSWIDE_CONFDIR}/ and run
${progname}, mktexlsr and ${badly_used_prg}.
Please remove '$badly_located_cfg_file' and try again.\n" >&2
@@ -642,8 +642,8 @@
if [ $syswide_mode = 1 ]; then
output_file="$SYSWIDE_DEFAULT_OUTPUTFILE"
else
- # If tetex-bin is not installed, kpsewhich is not available, and we cannot
- # do anything
+ # If texlive-binaries is not installed, kpsewhich is not available,
+ # and we cannot do anything
if ! which kpsewhich >/dev/null; then
echo "kpsewhich isn't available. Cannot create" \
"$DEFAULT_OUTPUTFILE_BASENAME in user-specific mode." >&2
More information about the Debian-tex-commits
mailing list