[subversion-commit] SVN tex-common commit + diffs: r1819 - in
tex-common/trunk: conf/texmf.d debian doc scripts
Florent Rougon
frn at costa.debian.org
Sat Oct 14 13:39:49 UTC 2006
Author: frn
Date: 2006-10-14 13:39:48 +0000 (Sat, 14 Oct 2006)
New Revision: 1819
Modified:
tex-common/trunk/conf/texmf.d/85Misc.cnf
tex-common/trunk/debian/changelog
tex-common/trunk/debian/control
tex-common/trunk/debian/preinst.in
tex-common/trunk/doc/Makefile
tex-common/trunk/doc/TeX-on-Debian.sgml
tex-common/trunk/scripts/debianize-updmap
Log:
* debian/control: move po-debconf from Build-Depends-Indep to Build-Depends,
since it is used in the clean target of debian/rules.
* conf/texmf.d/85Misc.cnf: comment out the original TEXMFCNF setting, since
earlier entries are supposed to override later ones (OK, TEXMFCNF is special
in that it's frozen at compile-time, but having both values defined was
confusing IMO).
* scripts/debianize-updmap and debian/preinst.in had a $Id$ construct but no
corresponding svn:keywords property; this is now fixed.
* doc/TeX-on-Debian.sgml:
- cosmetic fixes (consistent capitalization, TeX live -> TeX Live, etc.)
- TeX Live had to be mentioned in two places of the section dealing with
font installation.
* doc/Makefile: declare the phony targets and remove a spurious space.
Modified: tex-common/trunk/conf/texmf.d/85Misc.cnf
===================================================================
--- tex-common/trunk/conf/texmf.d/85Misc.cnf 2006-10-14 11:47:21 UTC (rev 1818)
+++ tex-common/trunk/conf/texmf.d/85Misc.cnf 2006-10-14 13:39:48 UTC (rev 1819)
@@ -65,16 +65,13 @@
% The SELFAUTO* variables are set automatically from the location of
% argv[0], in kpse_set_progname.
%
-% The TETEXDIR stuff isn't likely to relevant unless you're using teTeX,
+% The TETEXDIR stuff isn't likely to be relevant unless you're using teTeX,
% but it doesn't hurt.
%
% For security reasons, it is better not to have . part of the path.
%
-TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c};$TETEXDIR;/usr/share/texmf/web2c;/usr/share/texmf/web2c
-% Since tetex-bin_3.0-22, it Restricts this to dirs that actually exist,
+% TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c};$TETEXDIR;/usr/share/texmf/web2c;/usr/share/texmf/web2c
+%
+% Since tetex-bin_3.0-22, it restricts this to dirs that actually exist,
% to silent e.g. automounters:
TEXMFCNF = $TETEXDIR;/usr/share/texmf/web2c;/usr/share/texmf/web2c
-
-
-
-
Modified: tex-common/trunk/debian/changelog
===================================================================
--- tex-common/trunk/debian/changelog 2006-10-14 11:47:21 UTC (rev 1818)
+++ tex-common/trunk/debian/changelog 2006-10-14 13:39:48 UTC (rev 1819)
@@ -1,15 +1,20 @@
-tex-common (0.34~1) unreleased; urgency=medium
+tex-common (0.34) unstable; urgency=medium
* Handle non-writable /usr/local gracefully upon removal, thanks to Sam
Hocevar <sam at zoy.org> (closes: #392518) [frank]
* Change debianize-updmap so that the --syncwithtrees and --edit options
do something sensible, and won't break the system (closes: #392573,
#334747) [frank]
+ This change justifies the "medium" urgency.
* Add a check for shadowed config files to the update-* scripts [preining]
* Move and extend the teTeX README.Debian to TeX-on-Debian Documentation
- [frank,preining]
+ [frank, preining]
+ * Move po-debconf from Build-Depends-Indep to Build-Depends, since it is
+ used in the clean target of debian/rules. [florent]
+ * Adjust the TEXMFCNF setting in conf/texmf.d/85Misc.cnf to reflect the
+ change in tetex-bin 3.0-22. [frank, florent]
- -- Norbert Preining <preining at debian.org> Fri, 13 Oct 2006 21:10:17 +0200
+ -- Florent Rougon <frn at debian.org> Sat, 14 Oct 2006 15:28:14 +0200
tex-common (0.33) unstable; urgency=medium
Modified: tex-common/trunk/debian/control
===================================================================
--- tex-common/trunk/debian/control 2006-10-14 11:47:21 UTC (rev 1818)
+++ tex-common/trunk/debian/control 2006-10-14 13:39:48 UTC (rev 1819)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian TeX maintainers <debian-tex-maint at lists.debian.org>
Uploaders: Julian Gilbey <jdg at debian.org>, C.M. Connelly <cmc at debian.org>, Atsuhito KOHDA <kohda at debian.org>, Frank Küster <frank at debian.org>, Florent Rougon <frn at debian.org>
-Build-Depends: debhelper (>= 4.0.0)
-Build-Depends-Indep: debiandoc-sgml, po-debconf, eperl
+Build-Depends: debhelper (>= 4.0.0), po-debconf
+Build-Depends-Indep: debiandoc-sgml, eperl
Standards-Version: 3.7.2.0
Package: tex-common
Property changes on: tex-common/trunk/debian/preinst.in
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: tex-common/trunk/doc/Makefile
===================================================================
--- tex-common/trunk/doc/Makefile 2006-10-14 11:47:21 UTC (rev 1818)
+++ tex-common/trunk/doc/Makefile 2006-10-14 13:39:48 UTC (rev 1819)
@@ -23,7 +23,7 @@
tex-on-debian-pdf: TeX-on-Debian.pdf
- TeX-on-Debian.pdf: TeX-on-Debian.sgml tex-sed
+TeX-on-Debian.pdf: TeX-on-Debian.sgml tex-sed
debiandoc2latexpdf -s ./tex-sed TeX-on-Debian.sgml
@@ -42,3 +42,7 @@
allclean: clean
-rm Debian-TeX-Policy.pdf
-rm TeX-on-Debian.pdf
+
+.PHONY: all install clean allclean \
+ policy-txt policy-html policy-pdf \
+ tex-on-debian-txt tex-on-debian-html tex-on-debian-pdf
Modified: tex-common/trunk/doc/TeX-on-Debian.sgml
===================================================================
--- tex-common/trunk/doc/TeX-on-Debian.sgml 2006-10-14 11:47:21 UTC (rev 1818)
+++ tex-common/trunk/doc/TeX-on-Debian.sgml 2006-10-14 13:39:48 UTC (rev 1819)
@@ -5,7 +5,7 @@
<titlepag>
<title>Debian-specific information about TeX packages</title>
<author>
- <name>The Debian TeX mailing List</name>
+ <name>The Debian TeX mailing list</name>
<email>debian-tex-maint at lists.debian.org</email>
</author>
<version>generated from $Id$</version>
@@ -15,9 +15,9 @@
the Debian teTeX packages (<package>tetex-bin</package>,
<package>tetex-base</package>, <package>tetex-extra</package>,
<package>tetex-doc</package>, <package>tetex-doc-nonfree</package> and
- <package>tetex-src</package>) and Debian TeX live packages (all
+ <package>tetex-src</package>) and Debian TeX Live packages (all
packages named <package>texlive-something</package>).
- Further Information, especially for
+ Further information, especially for
<em>developers</em>, can be found in the Debian TeX Policy draft in
<file>/usr/share/doc/tex-common/</file>. Information for people
upgrading from teTeX 2.0.2 in sarge is in the <file>NEWS.Debian</file>
@@ -112,69 +112,69 @@
</p>
<p>
- The Debian TeX live packages are comprised of in total
- (currently) 76 packages. The most important are:
+ The Debian TeX Live packages are comprised of (currently) 76 packages
+ in total. The most important are:
<taglist>
<tag><package>texlive-base-bin</package></tag>
<item>
- provides the basic binaries and basic TeX input files.
+ provides the basic binaries and basic TeX input files
</item>
<tag><package>texlive-latex-base</package></tag>
<item>
provides the most basic LaTeX input files, and will be
- sufficient for some simple documents.
+ sufficient for some simple documents
</item>
<tag><package>texlive-latex-recommended</package></tag>
<item>
- A recommended set of latex packages which are sufficient
+ a recommended set of LaTeX packages which are sufficient
for most typesetting purposes if you don't have any
- special requirements.
+ special requirements
</item>
<tag><package>texlive-fonts-recommended</package></tag>
<item>
- A recommended set of fonts which are sufficient
+ a recommended set of fonts which are sufficient
for most typesetting purposes if you don't have any
- special requirements.
+ special requirements
</item>
<tag><package>texlive-context</package></tag>
<item>
- The complete ConTeXt environment.
+ the complete ConTeXt environment
</item>
<tag><package>texlive</package></tag>
<item>
- A meta-package depending on a decent selection of
- packages, comprising all the above.
+ a meta-package depending on a decent selection of
+ packages, comprising all of the above
</item>
<tag><package>texlive-full</package></tag>
<item>
- A meta-package depending on all packages from the texlive
+ a meta-package depending on all packages from the TeX Live
group and on some other packages to create something
- similar to a full TeX live installation.
+ similar to a full TeX Live installation
</item>
<tag><package>texlive-doc-*</package></tag>
<item>
- Packages like <package>texlive-doc-en</package> and
+ packages like <package>texlive-doc-en</package> and
<package>texlive-doc-de</package> provide documentation in
- the respective language.
+ the respective language
</item>
<tag><package>texlive-lang-*</package></tag>
<item>
- Packages like <package>texlive-lang-dutch</package> and
- <package>texlive-lang-spanish</package> provide language
- specific support, like hyphenation patterns.
+ packages like <package>texlive-lang-dutch</package> and
+ <package>texlive-lang-spanish</package> provide
+ language-specific support, like hyphenation patterns
</item>
</taglist>
- There are many more packages, providing extra functionality
- and extra fonts. Please see the respective descriptions of
- these packages.
+ There are many more packages, providing extra functionality
+ and extra fonts. Please see the respective descriptions of
+ these packages.
</p>
</chapt>
@@ -300,7 +300,7 @@
<sect1>
<heading>System-wide versus user-specific configuration</heading>
<p>
- TeXLive as well as, since version 3.0, teTeX supports a
+ TeX Live as well as, since version 3.0, teTeX, supports a
complete user-specific configuration setup in the user's
home directory. System administrators must use the
commands <prgn>texconfig-sys</prgn>,
@@ -411,7 +411,7 @@
</heading>
<p>
These files contain configuration options from teTeX and/or
- TeXLive, possibly from you, and from other TeX-related
+ TeX Live, 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 should edit the source
@@ -561,7 +561,7 @@
<tt>z1</tt> to <tt>z0</tt> in
<file>/etc/texmf/dvips/config.ps</file> (second entry) (for
teTeX) and in
- <file>/etc/texmf/texlive/dvips/config.ps</file> (for TeX live).
+ <file>/etc/texmf/texlive/dvips/config.ps</file> (for TeX Live).
</p>
</sect>
@@ -577,7 +577,7 @@
</p>
<p>
- The Debian TeX live packages currently do not evaluate the
+ The Debian TeX Live packages currently do not evaluate the
settings of <file>/etc/papersize</file>, please set the
paper geometry explicitly in the (La)TeX source, e.g. using
the packages <tt>geometry</tt> or <tt>hyperref</tt>.
@@ -715,10 +715,10 @@
<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> and
- <file>/usr/share/texmf-tetex</file>; it follows the same layout,
- called the TeX Directory Structure (which is documented at <url
- id="http://www.tug.org/tds/" name="&urlname">).
+ <file>/usr/share/texmf</file>, <file>/usr/share/texmf-tetex</file>
+ and <file>/usr/share/texmf-texlive</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>
<p>
@@ -742,7 +742,7 @@
</p>
<p>
- Note: in teTeX 3 (as opposed to teTeX 2):
+ Note: in teTeX 3 and current TeX Live (as opposed to teTeX 2):
<list compact>
<item>
@@ -788,9 +788,10 @@
the manual pages for <prgn>update-updmap</prgn> and
<prgn>updmap-sys</prgn> for details.
</p>
+
<p>
You can also use <tt>updmap-sys --enable
- Map <var>foo</var>.map</tt>, it will create
+ Map <var>foo</var>.map</tt>; this will create
the <file>10local.cfg</file> file for you.
</p>
</item>
@@ -831,7 +832,7 @@
updated <file>updmap.cfg</file> to generate files that are
needed by <prgn>dvips</prgn>, <prgn>pdflatex</prgn>,
<prgn>dvipdfm</prgn>, etc., such as <file>psfonts.map</file>
- or <file>pdftex.map</file>.
+ and <file>pdftex.map</file>.
</p>
</item>
</enumlist>
@@ -867,9 +868,10 @@
<file><var>TEXMFCONFIG</var>/updmap.d/</file>. Note that most
likely you will have to create this directory first.
</p>
+
<p>
As for the site-wide installation, you can also
- use <tt>updmap --enable Map <var>foo</var>.map</tt>
+ use <tt>updmap --enable Map <var>foo</var>.map</tt>.
</p>
</item>
@@ -1011,13 +1013,12 @@
<item>
Note that teTeX is not further developed upstream, and new
- features will only be integrated in TeXlive. The Debian
- maintainers will not include anything in the TeXlive
- packages that is not already in TeXlive upstream.
+ features will only be integrated in TeX Live. The Debian
+ maintainers will not include anything in the TeX Live
+ packages that is not already in TeX Live upstream.
</item>
</list>
</p>
</chapt>
</book>
</debiandoc>
-
Property changes on: tex-common/trunk/scripts/debianize-updmap
___________________________________________________________________
Name: svn:keywords
+ Id
More information about the Pkg-tetex-commits
mailing list