[subversion-commit] SVN tetex commit + diffs: r122 - in
tetex-bin/trunk/debian: . patches
Frank Küster
frank at costa.debian.org
Sun Aug 7 18:23:23 UTC 2005
Author: frank
Date: 2005-08-07 18:23:22 +0000 (Sun, 07 Aug 2005)
New Revision: 122
Removed:
tetex-bin/trunk/debian/patches/patch-libpaper
Modified:
tetex-bin/trunk/debian/README.Debian
tetex-bin/trunk/debian/README.Developers
tetex-bin/trunk/debian/common.functions.in
tetex-bin/trunk/debian/common.variables
Log:
- updated README.Debian, removed most of README.Developers (now in the Policy Draft)
- updated common files
- remove patch-libpaper (included in patch-src anyway)
Modified: tetex-bin/trunk/debian/README.Debian
===================================================================
--- tetex-bin/trunk/debian/README.Debian 2005-08-07 16:49:43 UTC (rev 121)
+++ tetex-bin/trunk/debian/README.Debian 2005-08-07 18:23:22 UTC (rev 122)
@@ -22,7 +22,8 @@
tetex-doc. This package will only be needed by (La)TeX
developers, or if you want to look up licensing information.
-Information for DEVELOPERS can be found in README.Developers.
+Further Information, especially for DEVELOPERS, can be found in the
+Debian TeX Policy Draft in /usr/share/doc/tex-common/.
Information for people upgrading from teTeX-2.0.2 in sarge is in NEWS.Debian.
@@ -67,8 +68,7 @@
Linux, configuration files should be inside /etc, and generated files
in /var. In fact TeX will find system-wide configuration files in the
TEXMF tree, but either the files, or their directories are just
-symbolic links into the directories /var/lib/texmf or /etc/texmf (and
-some files in /var/lib/texmf are again links to files in /etc/texmf).
+symbolic links into the directories /var/lib/texmf or /etc/texmf.
On the other hand, any user can change their local configuration and
store it in appropriate subdirectories of $HOME/.texmf-config.
@@ -76,26 +76,17 @@
The central system-wide configuration files texmf.cnf (which controls
the basic operation and file search paths for the included programs),
-fmtutil.cnf (which specifies the available TeX formats) and updmap.cfg
-(font configuration) are handled through a Debian-specific mechanism
-that allows the teTex-packages, add-on packages and local
-administrators to combine their changes (see below).
+fmtutil.cnf (which specifies the available TeX formats) updmap.cfg (font
+configuration) and language.dat (hyphenation patterns for many formats)
+are handled through a Debian-specific mechanism that allows the
+teTex-packages, add-on packages and local administrators to combine
+their changes (see below).
For some configuration changes, there is a program called
texconfig-dialog (or simply texconfig for a commandline
frontend); alternatively, you can of course make the necessary changes
in configuration files by hand.
-- In order to use the hyphenation patterns for a given language, they
- need to be included in the format file. For common formats, namely
- (pdf)LaTeX, this is configured in /etc/texmf/language.dat. By
- default, however, simply (nearly) all hyphenation patterns are enabled
- in language.dat, and you need not bother about it. If you like, you
- can uncomment unneeded patterns. You can also easily manage that
- file using "dpkg-reconfigure tetex-bin", and "manage language.dat
- with debconf". User-specific formats with different hyphenation
- patterns can
-
1.2 Hyphenation
---------------
@@ -106,7 +97,8 @@
trifle more speed), you can exclude them from the format file by
changing the file specified in the third column of fmtutil.ncf -
usually language.dat - and rebuild the formats with fmtutil or
-fmtutil-sys.
+fmtutil-sys. Please note that in Debian, language.dat is a generated
+file (see 1.3 below).
For users of the norwegian and ukranian language, there are several
alternatives. For norwegian, there are different sets of patterns, and
@@ -118,18 +110,18 @@
see /usr/share/texmf/tex/generic/ukrhyph/ukrhyph.tex; you can also
choose different rule sets in the file.
-1.3 The files texmf.cnf, fmtutil.cnf, and updmap.cfg
-----------------------------------------------------
+1.3 The files texmf.cnf, fmtutil.cnf, updmap.cfg and language.dat
+-----------------------------------------------------------------
These files contain configuration options from teTeX itself, possibly
-from you, and from other TeX-related packages. They are (usually, see
-below) generated by scripts and should not be edited directly. Rather,
-you should edit the source files, or add new ones. Note that this only
-applies to the system-wide versions of these files; currently, changes
-to existing items made by teTeX updates or add-on packages will not be
-propagated to the user's files. Since all texmf.cnf files are read,
-with earlier definitions taking precedence over later ones, it is best
-to keep only a minimal set of definitions in the user-specific file.
+from you, and from other TeX-related packages. They are generated by
+scripts and should not be edited directly. Rather, you should edit the
+source files, or add new ones. Note that this only applies to the
+system-wide versions of these files; currently, changes to existing
+items made by teTeX updates or add-on packages will not be propagated to
+the user's files. Since all texmf.cnf files are read, with earlier
+definitions taking precedence over later ones, it is best to keep only a
+minimal set of definitions in the user-specific file.
1.3.1 texmf.cnf and update-texmf:
@@ -161,19 +153,22 @@
to place your customizations in an appropriate place in the sequence -
earlier definitions take precedence over later ones.
-1.3.2 fmtutil.cnf and update-fmtutil, updmap.cfg and update-updmap
+1.3.2 fmtutil.cnf and update-fmtutil, updmap.cfg and update-updmap,
+ language.dat and update-language
-These files are alsow generated files, just as it has been explained
+These files are also generated files, just as it has been explained
above for texmf.cnf. The difference to texmf.cnf is that these files
will be put into /var/lib/texmf/web2c, and any change made in these
-files will be UNCONDITIONALLY OVERWRITTEN by update-fmtutil and
-update-updmap, respectively. Only the files in /etc/texmf/updmap.d/
-and /etc/texmf/fmt.d/ will be treated as configuration files.
+files will be UNCONDITIONALLY OVERWRITTEN by update-fmtutil,
+update-language and update-updmap, respectively. Only the files in
+/etc/texmf/updmap.d/, /etc/texmf/fmt.d/ and /etc/texmf/language.d/ will
+be treated as configuration files.
As for texmf.cnf, the right way to change settings is to edit or add
-files in /etc/texmf/updmap.d/ or /etc/texmf/fmt.d/. The details have
-been described above (1.3.1). Note, however, that the extension for
-updmap files is '.cfg', not '.cnf'.
+files in /etc/texmf/updmap.d/, /etc/texmf/fmt.d/ or
+/etc/texmf/language.d/. The details have been described above
+(1.3.1). Note, however, that the extension for updmap files is '.cfg',
+not '.cnf'.
1.4 available TEXMF trees for users and system administrators
--------------------------------------------------------------
@@ -235,7 +230,7 @@
In most cases, this error is the symptom of a syntax error in the
document - TeX is getting into an infinite loop, and after some time
all its internal registers have been used. Sometimes, however, a large
-document, that loads a package that uses a lot of TeX's registers,
+document that loads a package that uses a lot of TeX's registers
leads to that error, or to a similar error message. The package
documentation, the google archive, or TeX-related mailinglists or
newsgroups will be helpful to find out which parameter needs to be
@@ -291,7 +286,7 @@
If you wish to install a font package in a system-wide manner, please
follow the instructions in this section. If you are preparing a Debian
-package containing fonts, you should refer to the Debian teTeX policy
+package containing fonts, you should refer to the Debian TeX policy
instead.
In the following paragraphs, $TEXMFLOCAL stands for
@@ -310,7 +305,7 @@
"adobe", "urw" or "public") and <typeface> refers to the name of the
font family (e.g., "marvosym" or "lm"). If in doubt, you should have a
look at the system tree managed by Debian packages, /usr/share/texmf; it
-follows the same layout, called the TeX Directory Structure, and
+follows the same layout, called the TeX Directory Structure, and is
documented at:
http://www.tug.org/tds/
@@ -335,9 +330,10 @@
can read it with the command 'texdoc TETEXDOC').
b) Create a configuration file /etc/texmf/updmap.d/10local-foo.cfg (the
- extension ".cfg" is important!). The file should list the map files
- you stored in step a) under $TEXMFLOCAL, with one line per file, as
- in:
+ extension ".cfg" is important! You can also use one 10local.cfg for
+ all your locally installed fonts). The file should list the map
+ files you stored in step a) under $TEXMFLOCAL, with one line per
+ file, as in:
# This is a comment line
Map foo.map
Modified: tetex-bin/trunk/debian/README.Developers
===================================================================
--- tetex-bin/trunk/debian/README.Developers 2005-08-07 16:49:43 UTC (rev 121)
+++ tetex-bin/trunk/debian/README.Developers 2005-08-07 18:23:22 UTC (rev 122)
@@ -1,105 +1,16 @@
-****************************************************************
-This file is under construction. However, the sections that are
-written yet, and do not contain [...] should be reliable.
-
-****************************************************************
-
README.Developers for the teTeX packages
=========================================
-This document contains information that is relevant for developers of
-TeX-related packages in Debian. It is intended that it will once
-become some kind of "TeX policy" (except section 5). Therefore we
-tried to write it as generic as possible, in order to allow for
-different packages to provide the TeX programs and infrastructure -
-for example if someone packages TeXlive instead of teTeX.
+Most parts of this file have been moved to the Debian TeX Policy draft
+in /usr/share/doc/tex-common.
+
+
[TODO]:
- on what to depend? "You can rely on - what of? - tetex-base when you depend on tetex-bin"
-TABLE OF CONTENTS
------------------
-0. Definition of Terms
-1. Directory structure
-2. Splitting of the tetex-texmf tarball
-
- tetex-base, or something like it, should be sufficient as
- build-dependency for most Debian packages
-
-3. update-* mechanisms, dpkg
-4. The shared library: libkpathsea
-5. Remarks for Developers of the teTeX packages
-
-
-0. Definition of Terms
-======================
-
-- TeX-related packages:
-
- This term is used for all packages that provide files that will be
- found by the kpathsea library, this means packages that put files
- into one of the directory trees /usr/share/texmf,
- /usr/local/share/texmf, /usr/share/texmf-site, or /var/lib/texmf, or
- packages that put files directly into /etc/texmf/ . The last
- directory contains files to which symlinks point from the TEXMF trees.
-
- Packages that merely depend on some functionality of TeX (or
- LaTeX,...) and libkpathsea, or packages that are useful for
- postprocessing of (pdf)(La)TeX output files, are not considered to
- be "TeX-related" in this sense.
-
-- TeX packages:
-
- Packages that provide the basic functionality of Donald E. Knuth's
- TeX program or it's successors, and metafont. Currently there is
- only one group of packages that do that, namely tetex-base and
- tetex-bin. The generic name "tex" is reserved for a possible virtual
- package that would be provided by either the teTeX packages or some
- other TeX distribution.
-
-
-
-1. Directory structure
-======================
-
-Files for TeX-related packages have to follow two standards: The
-Filesystem Hierarchy Standard FHS, mandated by Debian Policy, and the
-TeX Directory Structure TDS. The TDS requires that all files can be
-found within one of the TEXMF directory trees. There can be more than
-one TEXMF tree, but files are not looked for outside these
-trees. Within these trees we have mostly static, architecture-
-independent text files, but also some generated files and
-configuration files.
-
-According to FHS, these types of files need to reside in different
-top-level hierarchies. This is
-[...]
-
-
-2. Splitting of the tetex-texmf tarball
-=======================================
-
-tetex-base should be sufficient as build-dependency for most Debian
-packages
-[...]
-
-3. update-* mechanisms, dpkg
-============================
-
-- Some should-clauses for packages' use of update-*
-
-- document the planned DPKg {Post-Invoke} Feature (cf. the zope package)
-
-
-4. The shared library: libkpathsea
-==================================
-
-- remarks for packages depending on libkpathsea. Could be put into a
- separate README.
-
-
-5. Remarks for Developers of the teTeX packages
+Remarks for Developers of the teTeX packages
===============================================
- We should remove symlinks from orig.tar.gz because cvs-upgrade disliked
@@ -111,8 +22,8 @@
- Empty directories in the texmf-tree are needless. We have to remove
them when creating the .orig.tar.gz.
-- We should remove CVS directories. Try to run
- "find . -name CVS -prune -exec rm -rf {} \;"
+- We should remove .svn directories. Try to run
+ "find . -name .svn -prune -exec rm -rf {} \;"
- When you test outside CVS, then don't forget to copy texmf.d and
new-manpages
@@ -120,9 +31,9 @@
- We should update the dh_makeshlibs call in debian/rules when libkpathsea
is updated.
-- We maintain our teTeX packages with CVS and anyone can check out the
- latest CVS tree with the following command
- cvs -d:pserver:anonymous at cvs.debian.org:/cvs/tetex co tetex-bin
- and a blank password.
+- We maintain our teTeX packages with .svn and anyone can check out the
+ latest .svn tree with the following command
+
+ ...
-- Frank Küster <frank at debian.org>, Thu Jul 29 10:21:27 2004
Modified: tetex-bin/trunk/debian/common.functions.in
===================================================================
--- tetex-bin/trunk/debian/common.functions.in 2005-08-07 16:49:43 UTC (rev 121)
+++ tetex-bin/trunk/debian/common.functions.in 2005-08-07 18:23:22 UTC (rev 122)
@@ -3,7 +3,7 @@
## Function definitions - included from file common.functions
#################################################################
# Copyright (C) 2004 by Frank Küster <frank at debian.org>.
-# $Id: common.functions.in,v 1.1.1.1 2005/06/13 17:21:58 frank Exp $
+# $Id$
# internal variables for common.functions
MKTMPDIR=/tmp
Modified: tetex-bin/trunk/debian/common.variables
===================================================================
--- tetex-bin/trunk/debian/common.variables 2005-08-07 16:49:43 UTC (rev 121)
+++ tetex-bin/trunk/debian/common.variables 2005-08-07 18:23:22 UTC (rev 122)
@@ -1,20 +1,11 @@
<:# Copyright (C) 1999, 2000, 01, 02 by Davide Giovanni Maria Salvetti <salve at debian.org>.:>//
<:# Copyright (C) 2004, 05 by Frank Küster <frank at debian.org>.:>//
-<:# $Id: common.variables,v 1.4 2005/07/18 15:44:36 frank Exp $:>//
-<:# this list is from dpkg-1.10.9/include/dpkg.h.in: :>//
-<:$DPKG_EXTENSIONS="'~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist":>//
-<:$PREINST_MOVE_EXT="preinst-bak":>//
-<:$POSTINST_MOVE_EXT="postinst-bak":>//
-<:$PURGE_EXTENSIONS="$DPKG_EXTENSIONS $PREINST_MOVE_EXT $POSTINST_MOVE_EXT":>//
+<:# $Id$:>//
<:# package specific:>//
<:$ETC="/etc/":>//
<:$etc="/etc/texmf/":>//
<:$doc="/usr/share/doc/$PACKAGE/":>//
-<:$TEXMFSYSVAR="/var/lib/texmf":>//
<:$MKTMPDIR="/tmp":>//
-<:$FONTMAP_MEMORY_DIR="/var/lib/tex-common/fontmap-cfg":>//
-<:$LANGUAGE_MEMORY_DIR="/var/lib/tex-common/language-cnf":>//
-<:$LANGUAGE_DIR="$etc/language.d":>//
<:$LDAT_PATTERNS="inhyph.tex bahyph.tex cahyph.tex hrhyph.tex czhyph.tex \\
dehypht.tex dehyphn.tex dkhyphen.tex nehyph.tex fi8hyph.tex frhyph.tex \\
gahyph.tex grhyph.tex icehyph.tex ithyph.tex lahyph.tex huhyph.tex nohyph.tex \\
@@ -22,9 +13,6 @@
sehyph.tex skhyph.tex sihyph23.tex sphyph.tex trhyph.tex ukrhyph.tex \\
ukrhyph.t2a ukrhyph.lcy ukrhyph.ot2":>//
<:$TEXMF_CNF="/etc/texmf/texmf.cnf":>//
-<:$TEXMF_PARTS="05TeXMF 15Plain 45TeXinputs 55Fonts 65BibTeX 75DviPS 85Misc 90TeXDoc 95NonPath":>//
-<:for (@TEXMF_PARTS_FULLNAME=split(/ /,$TEXMF_PARTS)){s{(.*)}{texmf.d/$1.cnf}}:>//
-<:$TEX_COMMON_UCF_FILES="@TEXMF_PARTS_FULLNAME updmap.d/00updmap.cfg":>//
<:$confstatedir="/var/lib/tetex":>//
<:$no_config_prefix="admin-wants-no":>//
<:# get the package version:>//
@@ -39,7 +27,6 @@
$sarge_rev=$rev-1;
($SARGEVERSION=$VERSION)=~s/(.*-)$rev(.*)/$1$sarge_rev.sarge$2/;
}:>//
-<:$FIRST_BASE_VERSION_WITH_COMMON="3.0-4":>//
<:$README_sarge=''; $README_sarge='sarge/README.sarge' if -e 'sarge-stamp':>//
<:# upgrading stuff:>//
<:$SYMLINK_MOVE_EXT="moved-by-preinst":>//
Deleted: tetex-bin/trunk/debian/patches/patch-libpaper
===================================================================
--- tetex-bin/trunk/debian/patches/patch-libpaper 2005-08-07 16:49:43 UTC (rev 121)
+++ tetex-bin/trunk/debian/patches/patch-libpaper 2005-08-07 18:23:22 UTC (rev 122)
@@ -1,119 +0,0 @@
---- texk/dvipdfm/Makefile.in.orig
-+++ texk/dvipdfm/Makefile.in
-@@ -3,7 +3,7 @@
- LDFLAGS=@LDFLAGS@
- CPPFLAGS=@CPPFLAGS@ -I.
- INSTALL=@INSTALL@
--LIBS=@LIBS@ -lm
-+LIBS=@LIBS@ -lm -lpaper
- srcdir=@srcdir@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
---- texk/dvipdfm/dvipdfm.1
-+++ texk/dvipdfm/dvipdfm.1
-@@ -127,7 +127,8 @@
- .TP 5
- .B \-\^p " paper"
- Select the papersize by name (e.g.,
--.BR letter ", " legal ", " ledger ", " tabloid ", " a3 ", " a4 ", or " a5
-+.BR letter ", " legal ", " ledger ", " tabloid ", " a3 ", " a4 ", "
-+.BR a5 ", " a6 ", " b3 ", " b4 ", " b5 ", " b6 ", or " b5var
- )
-
- .TP 5
---- texk/dvipdfm/dvipdfm.c.orig
-+++ texk/dvipdfm/dvipdfm.c
-@@ -27,6 +27,7 @@
- #include <string.h>
- #include <limits.h>
- #include <ctype.h>
-+#include <paper.h>
- #include "config.h"
- #include "system.h"
- #include "mem.h"
-@@ -62,23 +64,35 @@
- {"legal" , { 612.0, 1008.0}},
- {"ledger" , { 1224.0, 792.0}},
- {"tabloid" , { 792.0, 1224.0}},
-+ {"a6" , { 297.64, 420.91}},
- {"a5" , { 420.91, 595.27}},
- {"a4" , { 595.27, 841.82}},
-- {"a3" , { 841.82, 1190.16}}};
-+ {"a3" , { 841.82, 1190.16}},
-+ {"b6" , { 364.25, 515.91}},
-+ {"b5" , { 515.91, 728.50}},
-+ {"b4" , { 728.50, 1031.81}},
-+ {"b3" , { 1031.81, 1457.00}},
-+ {"b5var" , { 515.91, 651.97}}};
-
--static rect get_paper_size (char *string)
-+static rect get_paper_size (char *string, int error_flag)
- {
-+ rect nullpaper = { 0.0, 0.0 };
- int i;
-+ if (string == NULL || string[0] == '\0')
-+ return nullpaper;
- for (i=0; i<sizeof(paper_sizes)/sizeof(paper_sizes[0]); i++) {
- if (!strcmp (string, paper_sizes[i].s))
- break;
- }
- if (i == sizeof(paper_sizes)/sizeof(paper_sizes[0]))
-+ { if (!error_flag)
-+ return nullpaper;
-+ else
- ERROR ("Paper size is invalid");
-+ }
- return paper_sizes[i].data;
- }
-
--
- char *dvi_filename = NULL, *pdf_filename = NULL;
- static void set_default_pdf_filename(void)
- {
-@@ -113,7 +127,8 @@
- fprintf (stdout, "-l \t\tLandscape mode\n");
- fprintf (stdout, "-m number\tSet additional magnification\n");
- fprintf (stdout, "-p papersize\tSet papersize (letter, legal,\n");
-- fprintf (stdout, " \tledger, tabloid, a4, or a3) [letter]\n");
-+ fprintf (stdout, " \tledger, tabloid, a6, a5, a4, a3,\n");
-+ fprintf (stdout, " \tb6, b5, b4, b3, or b5var) [letter]\n");
- fprintf (stdout, "-r resolution\tSet resolution (in DPI) for raster fonts [600]\n");
- fprintf (stdout, "-s pages\tSelect page ranges (-)\n");
- fprintf (stdout, "-t \tEmbed thumbnail images\n");
-@@ -367,7 +382,7 @@
- struct rect paper_size;
- if (argc < 2)
- ERROR ("Missing paper size");
-- paper_size = get_paper_size (argv[1]);
-+ paper_size = get_paper_size (argv[1], 1);
- paper_width = paper_size.width;
- paper_height = paper_size.height;
- pop_arg();
-@@ -507,8 +523,7 @@
- psimage_close();
- }
-
--static char *config_file_name = "config";
--static void read_config_file (void)
-+static void read_config_file (char *config_file_name)
- {
- char *full_config_name, *start, *end;
- char *argv[2], *option;
-@@ -578,8 +593,17 @@
- argv+=1;
- argc-=1;
-
-+ {
-+ rect paper_size = get_paper_size (systempapername (), 0);
-+ if (paper_size.width != 0) {
-+ paper_width = paper_size.width;
-+ paper_height = paper_size.height;
-+ }
-+ }
- /* Process config file, if any */
-- read_config_file();
-+ /* yes, in Debian there are two: config and an additional fontmaps file */
-+ read_config_file("config");
-+ read_config_file("fontmaps");
-
- do_args (argc, argv);
More information about the Pkg-tetex-commits
mailing list