[Debian-tex-commits] SVN tex-common commit + diffs: r1981 - in
tex-common/trunk: debian doc scripts
Florent Rougon
frn at alioth.debian.org
Wed Dec 6 15:48:53 CET 2006
Author: frn
Date: 2006-12-06 15:48:53 +0100 (Wed, 06 Dec 2006)
New Revision: 1981
Modified:
tex-common/trunk/debian/tex-common.doc-base.tex-sub-policy
tex-common/trunk/doc/Debian-TeX-Policy.sgml
tex-common/trunk/doc/TeX-on-Debian.pdf
tex-common/trunk/doc/TeX-on-Debian.sgml
tex-common/trunk/scripts/dh_installtex
Log:
* Various cosmetic fixes.
* Replace all 10foo.cfg with 20foo.cfg and similar in the TeX policy to avoid
suggesting "bad" practices.
* Set the svn:mime-type property of doc/TeX-on-Debian.pdf to application/pdf
so that changes to this file don't show up as a huge binary chunk in the
output of 'svn diff'.
Modified: tex-common/trunk/debian/tex-common.doc-base.tex-sub-policy
===================================================================
--- tex-common/trunk/debian/tex-common.doc-base.tex-sub-policy 2006-12-06 14:16:39 UTC (rev 1980)
+++ tex-common/trunk/debian/tex-common.doc-base.tex-sub-policy 2006-12-06 14:48:53 UTC (rev 1981)
@@ -2,7 +2,7 @@
Title: The Debian TeX sub-policy
Author: debian-tex-maint at lists.debian.org
Abstract: Rules and information for packaging TeX add-on packages
- (styles, fonts, viewers etc.).
+ (styles, fonts, viewers, etc.).
Section: Apps/Text
Format: text
Modified: tex-common/trunk/doc/Debian-TeX-Policy.sgml
===================================================================
--- tex-common/trunk/doc/Debian-TeX-Policy.sgml 2006-12-06 14:16:39 UTC (rev 1980)
+++ tex-common/trunk/doc/Debian-TeX-Policy.sgml 2006-12-06 14:48:53 UTC (rev 1981)
@@ -161,7 +161,7 @@
<p>
<list>
<item>
- Ah package that only installs TeX input files, e.g. a new
+ A package that only installs TeX input files, e.g. a new
LaTeX package, should install them in
the <var>TEXMFMAIN</var> tree
(<file>/usr/share/texmf/</file>) at the place indicated by
@@ -173,8 +173,8 @@
<item>
Packages that add fonts, hyphenation patterns or formats, or
want to change the basic configuration
- in <file>texmf.cnf</file> need to follow the rules in
- in <ref id="update-progs"> addition to that.
+ in <file>texmf.cnf</file>, need to follow the rules in
+ <ref id="update-progs"> in addition to that.
</item>
</list>
</p>
@@ -206,7 +206,7 @@
more severe bug, however, if it conforms to the current TDS
version but does not make sure to depend on an appropriately
recent version of the Basic TeX packages or
- <package>tex-common</package> (that support this TDS version).
+ <package>tex-common</package> (that supports this TDS version).
</p>
<p>The Basic TeX packages must provide a mechanism for searching
@@ -586,11 +586,11 @@
It should install one or more configuration files with names
following the pattern <tt>20<var>name</var>.cfg</tt> into
<file>/etc/texmf/updmap.d/</file><footnote> Filenames
- starting with <tt>10</tt> are reserved for the basic
+ starting with <tt>10</tt> are reserved for the Basic
TeX packages. However, sorting order is actually
only relevant for snippets
for <file>texmf.cnf</file>, <file>fmtutil.cnf</file>
- and <file>language.dat</file>
+ and <file>language.dat</file>.
</footnote>. Such files will be later
merged by <prgn>update-updmap</prgn> to form
<file>/var/lib/texmf/web2c/updmap.cfg</file>, the effective
@@ -618,15 +618,15 @@
<file>/var/lib/tex-common/fontmap-cfg/<var>package</var>.list</file>
that contains a reference to every <tt>.cfg</tt> file from the
previous step, one per line. For instance, if
- <var>package</var> installs <file>10foo.cfg</file> and
- <file>10bar.cfg</file> into <file>/etc/texmf/updmap.d/</file>,
+ <var>package</var> installs <file>20foo.cfg</file> and
+ <file>20bar.cfg</file> into <file>/etc/texmf/updmap.d/</file>,
the contents of
<file>/var/lib/tex-common/fontmap-cfg/<var>package</var>.list</file>
should be:
<example>
-10foo
-10bar
+20foo
+20bar
</example>
This <file><var>package</var>.list</file> file must be shipped
@@ -759,23 +759,23 @@
<p>
The solution we chose was to add a little bit of logic into
<prgn>update-updmap</prgn>, so that whenever it sees a
- <file>.cfg</file> file (let's call it <file>10foo.cfg</file>)
+ <file>.cfg</file> file (let's call it <file>20foo.cfg</file>)
that has the "magic comment", it actually includes its contents
into <file>updmap.cfg</file> if, and only if:
<list>
<item>
it is up-to-date (which is assumed if
- <file>10foo.cfg.dpkg-new</file> doesn't exist in the same
+ <file>20foo.cfg.dpkg-new</file> doesn't exist in the same
directory);
</item>
<item>
- <tt>10foo</tt> appears on a line by itself in one of the
+ <tt>20foo</tt> appears on a line by itself in one of the
<file>.list</file> files in
<file>/var/lib/tex-common/fontmap-cfg/</file>.
</item>
</list>
Additionally, that <file>.list</file> file should be named
- <file><var>package</var>.list</file> if <file>10foo.cfg</file>
+ <file><var>package</var>.list</file> if <file>20foo.cfg</file>
comes from <var>package</var>, for simple reasons of tidiness.
</p>
@@ -803,9 +803,9 @@
If <var>package</var> is reinstalled later, two files are
first created by <prgn>dpkg</prgn> during the unpack phase:
<file>/var/lib/tex-common/fontmap-cfg/<var>package</var>.list</file>
- and <file>/etc/texmf/updmap.d/10foo.cfg.dpkg-new</file>. As
+ and <file>/etc/texmf/updmap.d/20foo.cfg.dpkg-new</file>. As
long as the second one exists, the conffile
- <file>/etc/texmf/updmap.d/10foo.cfg</file> will be ignored
+ <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
Property changes on: tex-common/trunk/doc/TeX-on-Debian.pdf
___________________________________________________________________
Name: svn:mime-type
+ application/pdf
Modified: tex-common/trunk/doc/TeX-on-Debian.sgml
===================================================================
--- tex-common/trunk/doc/TeX-on-Debian.sgml 2006-12-06 14:16:39 UTC (rev 1980)
+++ tex-common/trunk/doc/TeX-on-Debian.sgml 2006-12-06 14:48:53 UTC (rev 1981)
@@ -423,7 +423,7 @@
possibly from you, and from other TeX-related packages. They
are generated by scripts and should not &mdash in fact,
except <file>texmf.cnf</file> may not &mdash be edited
- directly. Rather, you work with the source files in the
+ directly. Rather, you should work with the source files in the
respective directories below <file>/etc/texmf/</file>.
</p>
@@ -590,7 +590,7 @@
not be propagated to the user's files.
</p>
<p>
- <prgn>upmap(1)</prgn> provides the same options for
+ <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
Modified: tex-common/trunk/scripts/dh_installtex
===================================================================
--- tex-common/trunk/scripts/dh_installtex 2006-12-06 14:16:39 UTC (rev 1980)
+++ tex-common/trunk/scripts/dh_installtex 2006-12-06 14:48:53 UTC (rev 1981)
@@ -48,9 +48,9 @@
following the Debian TeX Policy should only install files into these
directories and /etc/texmf (which does not need a ls-R DB), so this is
a sensible choice. If you need to rehash the ls-R database of some other
-trees (eg. because an old package had files in /usr/share/texmf-tetex)
-please specify these additional trees on the command line via the
-texmftrees option:
+trees (e.g., because an old version of your package had files in
+/usr/share/texmf-tetex), please specify these additional trees on the
+command line via the texmftrees option:
dh_installtex texmftrees=tree1,tree2,...
@@ -59,16 +59,15 @@
=head1 COMPLEX USAGE: Registering fonts, hyphenation patterns and formats
-If in addition you have to install map files, hyphenation patterns for
+If in addition, you have to install map files, hyphenation patterns for
additional languages, or format definitions you can use three
different methods to specify what should be installed:
1) B<Pre made config files:> These files can be specified with the
different I<type>file= options, together with an optional priority.
I<type> can be one of map, format and language, and these files will be
-installed into /etc/texmf/I<configdir>/ for the respective type (for
-map files updmap.d, for language files language.d, and for format
-files fmt.d).
+installed into /etc/texmf/I<configdir>/ for the respective type (updmap.d for
+map files, language.d for language files, and fmt.d for format files).
Example:
More information about the Debian-tex-commits
mailing list