[Debian-tex-commits] SVN tex-common commit + diffs: r5256 - in tex-common/branches/v3: debian doc

Norbert Preining preining at alioth.debian.org
Thu Mar 22 07:27:23 UTC 2012


Author: preining
Date: 2012-03-22 07:27:22 +0000 (Thu, 22 Mar 2012)
New Revision: 5256

Modified:
   tex-common/branches/v3/debian/changelog
   tex-common/branches/v3/debian/rules
   tex-common/branches/v3/doc/TeX-on-Debian.pdf
   tex-common/branches/v3/doc/TeX-on-Debian.sgml
Log:
update documentation, add lintian asked for makefile targets


Modified: tex-common/branches/v3/debian/changelog
===================================================================
--- tex-common/branches/v3/debian/changelog	2012-03-21 23:44:20 UTC (rev 5255)
+++ tex-common/branches/v3/debian/changelog	2012-03-22 07:27:22 UTC (rev 5256)
@@ -10,8 +10,10 @@
   * do not add a universal fail clause in the debhelper generated
     maintainer scripts parts if the script is called with an
     unknown argument (scripts/post{inst,rm}-tex)
+  * lintian warning: add addition makefile targets
+  * doc: first run on updated documentation
 
- -- Norbert Preining <preining at debian.org>  Wed, 21 Mar 2012 23:22:06 +0900
+ -- Norbert Preining <preining at debian.org>  Thu, 22 Mar 2012 14:25:13 +0900
 
 tex-common (3.3) experimental; urgency=low
 

Modified: tex-common/branches/v3/debian/rules
===================================================================
--- tex-common/branches/v3/debian/rules	2012-03-21 23:44:20 UTC (rev 5255)
+++ tex-common/branches/v3/debian/rules	2012-03-22 07:27:22 UTC (rev 5256)
@@ -18,7 +18,9 @@
 nonbin_installfiles=$(foreach script,$(nonbin_scripts), scripts/$(script)) \
 	texmf/web2c/mktex.cnf 
 
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 
 build-stamp: $(EPERL_FILES) debian/po/templates.pot
 	dh_testdir

Modified: tex-common/branches/v3/doc/TeX-on-Debian.pdf
===================================================================
(Binary files differ)

Modified: tex-common/branches/v3/doc/TeX-on-Debian.sgml
===================================================================
--- tex-common/branches/v3/doc/TeX-on-Debian.sgml	2012-03-21 23:44:20 UTC (rev 5255)
+++ tex-common/branches/v3/doc/TeX-on-Debian.sgml	2012-03-22 07:27:22 UTC (rev 5256)
@@ -24,7 +24,7 @@
 
       <copyright>
         <copyrightsummary>
-          Copyright © 2004-2007 Frank Küster, Florent Rougon,
+          Copyright © 2004-2012 Frank Küster, Florent Rougon,
         Norbert Preining
         </copyrightsummary>
         <p>
@@ -63,11 +63,17 @@
         The Debian TeX Live packages are comprised of (currently) 80 packages
         in total. The most important are:
         <taglist>
-          <tag><package>texlive-base-bin</package></tag>
+          <tag><package>texlive-binaries</package></tag>
           <item>
-            provides the basic binaries and basic TeX input files
+            provides the basic binaries and scripts, but is practically
+	    useless by itself
           </item>
 
+          <tag><package>texlive-base</package></tag>
+          <item>
+	    provides a minimal system
+          </item>
+
           <tag><package>texlive-latex-base</package></tag>
           <item>
             provides the most basic LaTeX input files, and will be
@@ -184,35 +190,52 @@
               </p>
             </item>
 
-            <tag><var>TEXMFLOCAL</var></tag>
+            <tag><var>TEXMFDEBIAN</var></tag>
             <item>
               <p>
-                Default location: <file>/usr/local/share/texmf/</file>
+                Default location: <file>/usr/share/texmf/</file>
               </p>
               <p>
-                Contains system-wide input files 
+	        Contains files shipped by Debian packages other than
+		the main texlive packages.
+		This tree contains system-wide, <prgn>dpkg</prgn>-managed 
+		input files.
               </p>
             </item>
 
             <tag><var>TEXMFMAIN</var></tag>
             <item>
               <p>
-                Default location: <file>/usr/share/texmf/</file>
+                Default location: <file>/usr/share/texlive/texmf/</file>
               </p>
               <p>
-                Contains system-wide, <prgn>dpkg</prgn>-managed input files
-                (TeX add-on packages) 
+	        Contains files that are closely related to the binaries
+		and the specific version, thus this tree has higher
+		priority then <var>TEXMFLOCAL</var> below. It contains
+		only few system-wide, <prgn>dpkg</prgn>-managed input files.
               </p>
             </item>
 
+            <tag><var>TEXMFLOCAL</var></tag>
+            <item>
+              <p>
+                Default location: <file>/usr/local/share/texmf/</file>
+              </p>
+              <p>
+                Contains system-wide input files, used for configuration
+		on specific systems.
+              </p>
+            </item>
+
             <tag><var>TEXMFDIST</var></tag>
             <item>
               <p>
-                Default location: <file>/usr/share/texmf-texlive</file>
+                Default location: <file>/usr/share/texlive/texmf-dist</file>
               </p>
               <p>
-                Contains system-wide, <prgn>dpkg</prgn>-managed input files
-                (basic TeX packages)
+	        Contains the binary-independent files that are distributed
+		with TeX Live, comprising most of the input files, font
+		files etc. 
               </p>
             </item>
           </taglist>
@@ -223,7 +246,10 @@
           <var>TEXMFLOCAL</var> or <var>TEXMFHOME</var>, depending on whether
           you are the system administrator or a user. If needed, a system
           administrator can add additional trees to the <var>TEXMF</var>
-          variable in <file>/etc/texmf/texmf.d/05TeXMF.cnf</file> (earlier
+          variable by copying the definition of <var>TEXMF</var> from
+	  <file>/usr/share/texmf/web2c/texmf.cnf</file> into one file
+	  in <file>/etc/texmf/texmf.d/</file>, for example
+	  <file>/etc/texmf/texmf.d/00local.cnf</file> (earlier
           entries take precedence). <var>TEXMFCONFIG</var> and
           <var>TEXMFVAR</var> are used by the user-specific
           <prgn>texconfig</prgn>, <prgn>updmap</prgn>, and
@@ -275,20 +301,21 @@
             or <var>TEXMFCONFIG</var> of a particular user.  However,
             local admins can take any file they want from
             the <var>TEXMFDIST</var>
-            (<file>/usr/share/texmf-texlive</file>)
-            or <var>TEXMFMAIN</var> (<file>/usr/share/texmf</file>)
+            (<file>/usr/share/texlive/texmf-dist</file>)
+            or <var>TEXMFDEBIAN</var> (<file>/usr/share/texmf</file>)
             trees and put changed copies into the respective
             directories below <file>/etc/texmf</file>
             (<var>TEXMFSYSCONFIG</var> which sorts before all other
-            trees).
+            trees) or <file>/usr/local/share/texmf</file> 
+	    (<var>TEXMFLOCAL</var> which sorts before the above two trees).
           </p>
 
           <p>
             Since the package management system does not know whether a file
             is treated as a configuration file on a specific system, it is up
             to the site admin or local user to check whether one of their
-            changed files has changed in <var>TEXMFMAIN</var> or
-            <var>TEXMFDIST</var>.
+            changed files has changed in <var>TEXMFDIST</var> or
+            <var>TEXMFDEBIAN</var>.
           </p>
 
          <sect1>
@@ -297,43 +324,46 @@
             The central system-wide configuration files <file>texmf.cnf</file>
             (which controls the basic operation and file search paths for the
             included programs), <file>fmtutil.cnf</file> (which specifies the
-            available TeX formats), <file>updmap.cfg</file> (font
-            configuration) and <file>language.dat</file> (hyphenation patterns
-            for many formats) are handled through a Debian-specific mechanism
+            available TeX formats), (several) <file>updmap.cfg</file> (font
+            configuration) and <file>language.dat</file>, 
+	    <file>language.def</file>, <file>language.dat.lua</file>
+	    (hyphenation patterns for latex, etex, lualatex, resp.)
+	    are handled through a Debian-specific mechanism
             that allows the basic TeX packages, add-on packages and local
             administrators to combine their changes
             (see <ref id="sec-core-config-files"> below).
           </p>
 
-          <p>
-            For some configuration changes, there is a program called
-            <prgn>texconfig-dialog</prgn> (or simply <prgn>texconfig</prgn>
-            for a commandline frontend); alternatively, you can of course make
-            the necessary changes in configuration files by hand.
-          </p>
-
       <sect>
         <heading>Hyphenation</heading>
         <p>
           Hyphenation should pretty much work out of the box.
           Please note that
-          in Debian, language.dat is a generated file (see <ref
-          id="sec-core-config-files">).
+          in Debian, language.dat, language.def, language.dat.lua are 
+	  generated files (see <ref id="sec-core-config-files">).
         </p>
 
+<!--
         <p>
           For users of the ukranian language,
           the right pattern file depends on the output encoding 
           (see <file>/usr/share/texmf-texlive/tex/generic/ukrhyph/ukrhyph.tex</file>);
           you can also choose different rule sets in the file.
         </p>
+-->
 
       <sect id="sec-core-config-files">
         <heading>
           The files <file>texmf.cnf</file>, <file>fmtutil.cnf</file>,
-          <file>updmap.cfg</file> and <file>language.dat</file>
+          <file>updmap.cfg</file> and <file>language.*</file> group
         </heading>
 	<p>
+	In the following we will refer to the three files
+	<file>language.dat</file>, <file>language.def</file>, 
+	<file>language.dat.lua</file>, as <file>language.*</file>.
+	</p>
+
+	<p>
 	  In the following we describe ways to configure these files
 	  for the <em>system administrator</em>, i.e. one that has
 	  write access to the <file>/etc/texmf</file> hierachy. In
@@ -344,8 +374,7 @@
           <file>updmap.cfg</file> and <file>language.dat</file>
           contain configuration options from TeX Live,
           possibly from you, and from other TeX-related packages. They
-          are generated by scripts and should not—in fact,
-          except <file>texmf.cnf</file> may not—be edited
+          are generated by scripts and may not be edited
           directly. Rather, you should work with the source files in the
           respective directories below <file>/etc/texmf/</file>.
         </p>
@@ -357,9 +386,8 @@
           settings. For <file>texmf.cnf</file> snippets, this is
           particularly easy, since earlier entries override any later
           entries.  Only for removing settings
-          from <file>fmtutil.cnf</file>,
-          <file>updmap.cfg</file> or <file>language.dat</file> is it necessary
-          to edit existing files.
+          from <file>fmtutil.cnf</file>, or <file>language.*</file>
+	  it is necessary to edit existing files.
         </p>
 	
          <sect1 id="sec-texmfcnf-and-update-texmf">
@@ -367,12 +395,13 @@
             <file>texmf.cnf</file> and <prgn>update-texmf</prgn>
           </heading>
           <p>
-            The TeX binaries are built to look for <file>texmf.cnf</file> (the
-            master config file for TeX and Metafont) in
-            <file>/usr/share/texmf/web2c/texmf.cnf</file> (or
-            <file>$HOME/.texmf-config/web2c/texmf.cnf</file> if it exists).
-            The system-wide file is a symbolic link to
-            <file>/etc/texmf/texmf.cnf</file>. The Debian packaging includes a
+            The TeX binaries are built to look for and merge
+	    <file>texmf.cnf</file> files in various trees. That means
+	    that it is easy to override the default settings as shipped
+	    in 
+	    <file>/usr/share/texmf/web2c/texmf.cnf</file> by adding
+	    entries in <file>/etc/texmf/web2c/texmf.cnf</file>.
+            The Debian packaging includes a
             mechanism for constructing texmf.cnf from a collection of files
             under <file>/etc/texmf/texmf.d/</file>. To customize
             <file>texmf.cnf</file> while retaining the Debian-supplied
@@ -380,24 +409,22 @@
             <file>/etc/texmf/texmf.d/</file>, or change existing
             files, and then run <prgn>update-texmf</prgn>. This will
             generate the desired <file>texmf.cnf</file> for you.
+	    By default nothing is shipped in <file>/etc/texmf/texmf.d/</file>
+	    since no adaptions are necessary, but further addon packages
+	    might ship parts.
           </p>
 
           <p>
-            You should not edit this file directly! While changes made
-            by the local administrator will not be overwritten, they
-            will cause you trouble once a package is updated and
-            brings in a configuration change. You will be shown the
-            differences between the edited and the newly generated
-            file. We will try to merge our and your changes, but that
-            might not always work, and you will probably have to edit
-            again.
+            You may not edit the file <file>/etc/texmf/web2c/texmf.cnf</file>
+	    directly, any local changes will be overwritten the next
+	    time this file is generated.
           </p>
 
           <p>
-            Therefore, if you want a smooth upgrade, please edit the files in
+            Instead, please edit the files in
             <file>/etc/texmf/texmf.d</file>, or create an additional one, and
             invoke <prgn>update-texmf</prgn>. This will write your changes
-            into <file>/etc/texmf/texmf.cnf</file>.
+            into <file>/etc/texmf/web2c/texmf.cnf</file>.
           </p>
 
           <p>
@@ -416,8 +443,7 @@
          <sect1>
           <heading>
             <file>fmtutil.cnf</file> and <prgn>update-fmtutil</prgn>,
-            <file>updmap.cfg</file> and <prgn>update-updmap</prgn>,
-            <file>language.dat</file> and <prgn>update-language</prgn>
+            <file>language.*</file> and <prgn>update-language</prgn>
           </heading>
           <p>
             These files are also generated files, just as it has been
@@ -426,13 +452,11 @@
             be put into <file>/var/lib/texmf/web2c</file>, and any
             change made in these files will be <strong>unconditionally
             overwritten</strong>
-            by <prgn>update-fmtutil</prgn>, <prgn>update-language</prgn>
-            and
-            <prgn>update-updmap</prgn>, respectively.  Only the files
-	    in <file>/etc/texmf/updmap.d/</file>, <file>/etc/texmf/fmt.d/</file>
-	    and <file>/etc/texmf/language.d/</file> will be treated as
-	    configuration files.  Furthermore, the files <file>fmtutil.cnf</file>,
-	    <file>updmap.cfg</file> and <file>language.dat</file> are
+            by <prgn>update-fmtutil</prgn> and <prgn>update-language</prgn>,
+            respectively.  Only the files in <file>/etc/texmf/fmt.d/</file>
+	    and <file>/etc/texmf/hyphen.d/</file> will be treated as
+	    configuration files.  Furthermore, the files 
+	    <file>fmtutil.cnf</file> and <file>language.*</file> are
 	    used on a first-found-first-used basis, if there are more
 	    than one in the search path, whereas if there are
 	    several <file>texmf.cnf</file> files in the search path,
@@ -443,72 +467,39 @@
           <p>
             Just as for <file>texmf.cnf</file>, the right way to change
             settings is to edit or add files in
-            <file>/etc/texmf/updmap.d/</file>, <file>/etc/texmf/fmt.d/</file>
-            or <file>/etc/texmf/language.d/</file>. The details have been
+            <file>/etc/texmf/fmt.d/</file> 
+	    or <file>/etc/texmf/language.d/</file>. The details have been
             described above (see <ref id="sec-texmfcnf-and-update-texmf">).
-            Note, however, that the extension for <file>updmap.cfg</file>
-            snippets in <file>/etc/texmf/updmap.d/</file> is
-            <file>.cfg</file>, not <file>.cnf</file>.
           </p>
 
+         <sect1>
+          <heading>
+            <file>updmap.cfg</file>
+          </heading>
 	  <p>
+	    <prgn>updmap-sys(8)</prgn> reads <em>all</em> available
+	    <file>updmap.cfg</file> files found, stacking them
+	    on top of each other. That means that local configurations
+	    can be done by editing/adding a file in 
+	    <file>/etc/texmf/web2c/updmap.cfg</file>.
+	  </p>
+
+	  <p>
 	    <prgn>updmap-sys(8)</prgn> provides options for enabling
 	    or disabling font map files.  When enabling a new map file
-	    that is not mentioned, <prgn>updmap-sys</prgn> will first
-	    create or edit <file>10local.cfg</file> in
-	    the <file>/etc/texmf/updmap.d</file> directory and then
-	    call <prgn>update-updmap</prgn>.  Note
+	    that is not mentioned, <prgn>updmap-sys</prgn> will
+	    create or edit <file>/etc/texmf/web2c/updmap.cfg</file>. Note
 	    that <prgn>updmap-sys</prgn>'s <tt>--edit</tt>
 	    and <tt>--syncwithtrees</tt> options cannot be used on a
 	    Debian system.
-      
 	  </p>
-	
-         <sect1 id="jadetex-xmltex-specialcase">
-	   <heading>A special case in <prgn>update-fmtutil</prgn>:
-	   Formats which are based on other formats</heading>
-	   <p>
-	     The JadeTeX and xmlTeX formats are built on top of LaTeX
-	     and therefore require special treatment.  This is done
-	     automatically for the Debian packages for these formats.
-	     However, local administrators who similarly base their
-	     custom formats on LaTeX (or any other format) might need
-	     to take special care, in particular when dist-upgrading.
-	   </p>
-	   <p>
-	     JadeTeX is based on LaTeX such that during format
-	     generation, the LaTeX format dump is preloaded with this
-	     line in <file>fmtutil.cnf</file>:
-<example>
-jadetex		etex	language.dat	&latex jadetex.ini
-</example>
-             This is problematic if the package which provides LaTeX
-             (currently <package>texlive-latex-base</package>) is
-             upgraded at the same time as the package which provides
-             the executables
-             (currently <package>texlive-base-bin</package>).  In this
-             dpkg run, <package>texlive-base-bin</package> will be
-             configured while <package>texlive-latex-base</package> is
-             unpacked but unconfigured and might have
-             a <file>10texlive-latex-base.cnf.dpkg-new</file> file
-             in <file>/etc/texmf/fmt.d</file>.
-             <package>texlive-base-bin</package> will
-             call <prgn>update-fmtutil</prgn>  just before it executes
-             <tt>fmtutil --all</tt>, and because of
-             the <file>dpkg-new</file> file information for LaTeX will
-             not be included.  If JadeTeX would still be included, its
-             format generation would consequently fail.
-	   </p>
-	   <p>
-	     <prgn>update-fmtutil</prgn> knows about this problem and
-	     will ignore JadeTeX and xmlTeX if LaTeX is not
-	     available.  It does not know which other (locally
-	     defined) formats are also based on LaTeX, though.  To
-	     prevent failures (and actually a possible fork bomb, see
-	     Debian Bug #427562), local administrators should manually
-	     disable such formats before upgrading TeX Live packages.
-	   </p>
 
+	  <p>
+	    For more details on how to disable map files that are
+	    enabled on a higher level, please see the man page
+	    and help output of <prgn>updmap</prgn>.
+	  </p>
+	
          <sect1 id="sec-user-config-files">
           <heading>
 	    Per user configuration changes
@@ -518,8 +509,7 @@
 	    user wants to maintain their own <file>texmf.cnf</file>,
 	    they can put it into <tt><var>TEXMFCONFIG</var>/web2c</tt>
 	    and must manually edit it.  However, in order for it to be
-	    found, they need to set an environment
-	    variable
+	    found, they need to set an environment variable
 	    <footnote>
 	      The reason for this is that the search
 	      path for <file>texmf.cnf</file>, which is the file that
@@ -539,12 +529,11 @@
 
 	  <p>
 	    In contrast to the above—TeX reading and merging all
-	    <file>texmf.cnf</file> files—the <em>first</em> found occurrence of
-	    one of the files <file>updmap.cfg</file>, <file>language.dat</file>,
+	    <file>texmf.cnf</file> files—the <em>first</em> found 
+	    occurrence of one of the files <file>language.dat</file>,
 	    <file>fmtutil.cnf</file> is used. Thus, when called by a
 	    user, the other configuration update programs also work
 	    with files in
-	    <tt><var>TEXMFCONFIG</var>/updmap.d</tt>, 
 	    <tt><var>TEXMFCONFIG</var>/fmt.d</tt> or
 	    <tt><var>TEXMFCONFIG</var>/language.d</tt>, where
 	    <var>TEXMFCONFIG</var> is usually 
@@ -563,8 +552,8 @@
 	    <prgn>updmap(1)</prgn> provides the same options for
 	    enabling and disabling map files
 	    as <prgn>updmap-sys(8)</prgn>, see
-	    above.  <file>10local.cfg</file> is created or edited
-	    in <tt><var>TEXMFCONFIG</var>/updmap.d</tt>.
+	    above.  <file>updmap.cfg</file> is created or edited
+	    in <tt><var>TEXMFCONFIG</var>/web2c/</tt>.
 	  </p>
 
       <sect>
@@ -583,11 +572,9 @@
 	  On multi-user machines, it might be advisable that the local
 	  administrator enables a site-wide font cache and sets
 	  <var>VARTEXFONTS</var> to a persistent directory, e.g.
-	  <file>/var/cache/fonts</file>. The variable is set in
-	  <file>/etc/texmf/texmf.d/05TeXMF.cnf</file> and can either be
-	  changed there or preferrably overwritten in a file that sorts before
-	  <file>05TeXMF.cnf</file>, e.g.
-	  <file>/etc/texmf/texmf.d/04VARTEXFONTS.cnf</file>. Do not forget to
+	  <file>/var/cache/fonts</file>.  The variable can be changed
+	  by adding an entry via <file>/etc/texmf/texmf.d</file>, e.g.
+	  <file>/etc/texmf/texmf.d/00local.cnf</file>. Do not forget to
 	  run <prgn>update-texmf</prgn> after making the change. To enable a
 	  side-wide font caching the admin should edit
 	  <file>/etc/texmf/web2c/mktex.cnf</file> and use 'varfonts' instead
@@ -633,8 +620,10 @@
 -->
 
 	<p>
-	  The Debian TeX Live packages currently do not evaluate the
-          settings of <file>/etc/papersize</file>, please set the
+	  The Debian TeX Live packages do evaluate the
+          settings of <file>/etc/papersize</file>, please configure
+	  your preferred paper size with <prgn>paperconfig</prgn>.
+	  Alternatively, and more portable, thus recommended, set the
           paper geometry explicitly in the (La)TeX source, e.g. using
           the packages <tt>geometry</tt> or <tt>hyperref</tt>.
 	</p>
@@ -771,8 +760,8 @@
           <var>typeface</var> refers to the name of the font family (e.g.,
           <tt>marvosym</tt> or <tt>lm</tt>). If in doubt, you should have a
           look at the system trees managed by Debian packages,
-          <file>/usr/share/texmf</file>, <file>/usr/share/texmf-texlive</file>
-          and <file>/usr/share/texmf-texlive</file>; they follow the same
+          <file>/usr/share/texmf</file> and
+	  <file>/usr/share/texlive/texmf-dist</file>; they follow the same
           layout, called the TeX Directory Structure (which is documented at
           <url id="http://www.tug.org/tds/" name="&urlname">).
         </p>
@@ -797,38 +786,10 @@
                 explained above.
               </p>
 
-              <p>
-                Note: in teTeX 3 and current TeX Live (as opposed to teTeX 2):
-
-                <list compact>
-                  <item>
-                    <file>.map</file> files should go to
-                    <file><var>TEXMFLOCAL</var>/fonts/map/<var>syntax</var>/<var>foo</var>/</file>
-                  </item>
-
-                  <item>
-                    <file>.enc</file> files should go to
-                    <file><var>TEXMFLOCAL</var>/fonts/enc/<var>syntax</var>/<var>foo</var>/</file>
-                  </item>
-                </list>
-
-                where <var>syntax</var> indicates the syntax followed by the
-                files (it is often <tt>dvips</tt>). Please refer to the teTeX
-                Manual for details. You can read this manual with the command
-<example>
-texdoc TETEXDOC
-</example>
-              </p>
-            </item>
-
             <item>
               <p>
-                Create a configuration file
-                <file>/etc/texmf/updmap.d/10local-<var>foo</var>.cfg</file>
-                (the extension <file>.cfg</file> is important! You can also
-                use one <file>10local.cfg</file> for all your locally
-                installed fonts). The file should list the map files you
-                stored in step 1 under <var>TEXMFLOCAL</var>, with one line
+	        List the map files you stored in step 1 under 
+		<var>TEXMFLOCAL</var>, with one line
                 per file, as in:
 
 <example>
@@ -836,46 +797,31 @@
 Map <var>foo</var>.map
 Map other-map-file-from-package-<var>foo</var>.map
 </example>
-              </p>
+		
+		in the file
+		<file>/usr/local/share/texmf/web2c/updmap.cfg</file>.
+	      </p>
 
               <p>
                 If a font is available both as bitmap and outline, you should
                 use <tt>MixedMap</tt> instead of <tt>Map</tt>. Please refer to
-                the manual pages for <prgn>update-updmap</prgn> and
-                <prgn>updmap-sys</prgn> for details.
+                the manual pages for <prgn>updmap</prgn> for details.
               </p>
 
 	      <p>
+	        (not recommended, but possible)
 		You can also use <tt>updmap-sys --enable
-		Map <var>foo</var>.map</tt>; this will create
-		the <file>10local.cfg</file> file for you.
+		Map <var>foo</var>.map</tt>; this will create/edit
+		the <file>/etc/texmf/web2c/updmap.cfg</file> file for you.
+		But since the real files are stored in 
+		<var>TEXMFLOCAL</var> it is better to add the map directives
+		to the <file>updmap.cfg</file> in the same tree.
 	      </p>
             </item>
 
             <item>
               <p>
-                Run the program <prgn>update-updmap</prgn>. This will generate
-                an appropriate <file>updmap.cfg</file> file under
-                <file>/var/lib/texmf/web2c/</file> (not
-                <file>/etc/texmf/</file>!), containing the <tt>Map</tt> and/or
-                <tt>MixedMap</tt> lines taken from
-                <file>10local-<var>foo</var>.cfg</file>.
-              </p>
-    
-              <p>
-                Note: modifying <file>updmap.cfg</file> directly is not
-                supported in Debian, because Debian font packages need to
-                update it when they are installed or removed. This is why
-                <file>updmap.cfg</file> is not stored under <file>/etc</file>
-                and why you have to use <prgn>update-updmap</prgn> whenever
-                you want to modify it.
-              </p>
-            </item>
-
-            <item>
-              <p>
-                Run the program <prgn>mktexlsr</prgn> (or
-               <prgn>texhash</prgn>, which is the same). This will record all
+                Run the program <prgn>mktexlsr</prgn>. This will record all
                the newly created files in <file>ls-R</file> files (these are
                used by TeX-related programs as indices to find the files they
                need when operating).
@@ -917,12 +863,9 @@
             </item>
 
             <item>
-              <p>
-		The configuration file created in step 2 should be placed in
-		<var>TEXMFCONFIG</var> (<file>$HOME/.texmf-config</file> by
-		default). An appropriate place would be
-		<file><var>TEXMFCONFIG</var>/updmap.d/</file>. Note that most
-		likely you will have to create this directory first.
+	      <p>
+	      In step 2, edit <file><var>TEXMFHOME</var>/web2c/updmap.cfg</file>
+	      instead.
 	      </p>
 
 	      <p>
@@ -932,37 +875,13 @@
             </item>
 
             <item>
-              After updating the <file>ls-R</file> files with
-              <prgn>mktexlsr</prgn> or <prgn>texhash</prgn> (step 4), one has
-              to generate the map files in step 5. This is done by running the
-              program <prgn>updmap</prgn> instead of <prgn>updmap-sys</prgn>.
-              The generated files are created in directories below
-              <var>TEXMFVAR</var>.
+	      In step 3 run <prgn>updmap</prgn> instead of 
+	      <prgn>updmap-sys</prgn>. The generated files are created 
+	      in directories below <var>TEXMFVAR</var>.
             </item>
           </list>
         </p>
 
-        <p>
-          Note that <prgn>update-updmap</prgn> merges the configuration files
-          in <file>$HOME/.texmf-config/web2c/updmap.d</file> and in
-          <file>/etc/texmf/updmap.d</file>. Therefore, all system-wide
-          installed fonts are accessible without duplicating their
-          configuration files. Merging the configuration files is done on the
-          basis of file names: If a file exists in both directories, the
-          version in <var>TEXMFCONFIG</var> takes precedence. Thus, you can
-          also use this mechanism to change settings compared to the site-wide
-          configuration, e.g. by keeping a changed copy of
-          <file>00updmap.cfg</file> in
-          <file><var>TEXMFCONFIG</var>/updmap.d/</file>.
-        </p>
-
-        <p>
-          Keep in mind that you still have to call <prgn>update-updmap</prgn>
-          whenever the system-wide installation
-          changes. If you keep a changed copy of a file from the site-wide
-          directories, you need to manually merge any changes to this file, if
-          desired.
-        </p>
       </sect>
     </chapt>
 
@@ -992,7 +911,7 @@
 
           <item>
             Is <file>texmf.cnf</file> modified a lot? Please check
-            <file>/etc/texmf/texmf.d/</file>.
+            <file>/etc/texmf/web2c/texmf.d/</file>.
           </item>
 
           <item>




More information about the Debian-tex-commits mailing list