[subversion-commit] SVN tetex-bin commit + diffs: r1800 -
tetex-bin/trunk/debian/patches
Frank Küster
frank at costa.debian.org
Thu Oct 12 16:26:22 UTC 2006
Author: frank
Date: 2006-10-12 16:26:21 +0000 (Thu, 12 Oct 2006)
New Revision: 1800
Modified:
tetex-bin/trunk/debian/patches/patch-deb
Log:
- syncwithtrees doesn't work: note this in updmap.man
- syntax error in updmap
Modified: tetex-bin/trunk/debian/patches/patch-deb
===================================================================
--- tetex-bin/trunk/debian/patches/patch-deb 2006-10-12 16:22:43 UTC (rev 1799)
+++ tetex-bin/trunk/debian/patches/patch-deb 2006-10-12 16:26:21 UTC (rev 1800)
@@ -1,25 +1,25 @@
- configure | 13 ++++----
- texk/kpathsea/mktexlsr | 17 +++--------
+ configure | 13 ++++---
+ texk/kpathsea/mktexlsr | 17 +++-------
texk/make/paths.mk | 2 -
texk/tetex/Makefile.in | 10 +++---
- texk/tetex/fmtutil | 53 +++++++++++++++++++++++++++++++++---
- texk/tetex/fmtutil-sys | 10 +++++-
- texk/tetex/fmtutil.man | 19 ++++++++++++
+ texk/tetex/fmtutil | 53 +++++++++++++++++++++++++++++---
+ texk/tetex/fmtutil-sys | 10 ++++--
+ texk/tetex/fmtutil.man | 19 ++++++++++-
texk/tetex/texconfig | 7 ++--
- texk/tetex/texconfig-sys | 3 +-
- texk/tetex/texconfig.man | 46 +++++++++++++++++++++++++------
- texk/tetex/updmap | 66 ++++++++++++++++++++++++++++++++++++++++++---
- texk/tetex/updmap-sys | 3 +-
- texk/tetex/updmap.man | 36 +++++++++++++++++++-----
+ texk/tetex/texconfig-sys | 3 +
+ texk/tetex/texconfig.man | 46 +++++++++++++++++++++++----
+ texk/tetex/updmap | 74 +++++++++++++++++++++++++++++++++++++++------
+ texk/tetex/updmap-sys | 3 +
+ texk/tetex/updmap.man | 35 ++++++++++++++++-----
texk/web2c/cwebdir/cweb.1 | 10 +++---
texk/web2c/fmtutil.in | 2 -
texk/web2c/man/Makefile.in | 1
- 16 files changed, 236 insertions(+), 62 deletions(-)
+ 16 files changed, 237 insertions(+), 68 deletions(-)
Index: tetex-bin-3.0/configure
===================================================================
---- tetex-bin-3.0.orig/configure 2006-10-12 17:49:59.000000000 +0200
-+++ tetex-bin-3.0/configure 2006-10-12 17:51:35.000000000 +0200
+--- tetex-bin-3.0.orig/configure 2006-10-12 17:58:00.000000000 +0200
++++ tetex-bin-3.0/configure 2006-10-12 18:09:49.000000000 +0200
@@ -4213,12 +4213,13 @@
@@ -42,8 +42,8 @@
if test -z "$xdvik_standalone"; then
Index: tetex-bin-3.0/texk/kpathsea/mktexlsr
===================================================================
---- tetex-bin-3.0.orig/texk/kpathsea/mktexlsr 2006-10-12 17:49:59.000000000 +0200
-+++ tetex-bin-3.0/texk/kpathsea/mktexlsr 2006-10-12 17:51:35.000000000 +0200
+--- tetex-bin-3.0.orig/texk/kpathsea/mktexlsr 2006-10-12 17:58:00.000000000 +0200
++++ tetex-bin-3.0/texk/kpathsea/mktexlsr 2006-10-12 18:09:49.000000000 +0200
@@ -103,9 +103,9 @@
db_dir=`echo "$db_file" | sed 's%/[^/][^/]*$%%'` # can't rely on dirname
@@ -86,8 +86,8 @@
exit 0
Index: tetex-bin-3.0/texk/make/paths.mk
===================================================================
---- tetex-bin-3.0.orig/texk/make/paths.mk 2006-10-12 17:49:59.000000000 +0200
-+++ tetex-bin-3.0/texk/make/paths.mk 2006-10-12 17:51:35.000000000 +0200
+--- tetex-bin-3.0.orig/texk/make/paths.mk 2006-10-12 17:58:00.000000000 +0200
++++ tetex-bin-3.0/texk/make/paths.mk 2006-10-12 18:09:49.000000000 +0200
@@ -47,7 +47,7 @@
texmf = @texmfmain@
@@ -99,8 +99,8 @@
texinputdir = $(texmf)/tex
Index: tetex-bin-3.0/texk/tetex/Makefile.in
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/Makefile.in 2006-10-12 17:49:59.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/Makefile.in 2006-10-12 17:51:35.000000000 +0200
+--- tetex-bin-3.0.orig/texk/tetex/Makefile.in 2006-10-12 17:58:00.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/Makefile.in 2006-10-12 18:09:49.000000000 +0200
@@ -35,7 +35,7 @@
# Auxiliary files.
@@ -131,8 +131,8 @@
$(INSTALL_DATA) $(srcdir)/texmf/texconfig/g/generic $(texmf)/texconfig/g
Index: tetex-bin-3.0/texk/tetex/texconfig
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/texconfig 2006-10-12 17:49:59.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/texconfig 2006-10-12 17:51:35.000000000 +0200
+--- tetex-bin-3.0.orig/texk/tetex/texconfig 2006-10-12 17:58:00.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/texconfig 2006-10-12 18:09:49.000000000 +0200
@@ -883,8 +883,8 @@
faq)
@@ -163,8 +163,8 @@
else
Index: tetex-bin-3.0/texk/tetex/fmtutil
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/fmtutil 2006-10-12 17:49:59.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/fmtutil 2006-10-12 17:51:35.000000000 +0200
+--- tetex-bin-3.0.orig/texk/tetex/fmtutil 2006-10-12 17:58:00.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/fmtutil 2006-10-12 18:09:49.000000000 +0200
@@ -25,7 +25,13 @@
# --cnffile file set configfile for fmtutil
# --fmtdir directory set destination directory for format files
@@ -256,8 +256,8 @@
Index: tetex-bin-3.0/texk/tetex/fmtutil-sys
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/fmtutil-sys 2006-10-12 17:49:59.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/fmtutil-sys 2006-10-12 17:51:35.000000000 +0200
+--- tetex-bin-3.0.orig/texk/tetex/fmtutil-sys 2006-10-12 17:58:00.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/fmtutil-sys 2006-10-12 18:09:49.000000000 +0200
@@ -23,6 +23,12 @@
TEXMFVAR="$v"
@@ -275,8 +275,8 @@
+esac
Index: tetex-bin-3.0/texk/tetex/fmtutil.man
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/fmtutil.man 2006-10-12 17:49:59.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/fmtutil.man 2006-10-12 17:51:35.000000000 +0200
+--- tetex-bin-3.0.orig/texk/tetex/fmtutil.man 2006-10-12 17:58:00.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/fmtutil.man 2006-10-12 18:09:49.000000000 +0200
@@ -1,4 +1,4 @@
-.TH "fmtutil" "8" "February 2005" "teTeX" "teTeX"
+.TH "fmtutil" "1" "February 2005" "teTeX" "teTeX"
@@ -316,8 +316,8 @@
.PP
Index: tetex-bin-3.0/texk/web2c/fmtutil.in
===================================================================
---- tetex-bin-3.0.orig/texk/web2c/fmtutil.in 2006-10-12 17:49:59.000000000 +0200
-+++ tetex-bin-3.0/texk/web2c/fmtutil.in 2006-10-12 17:51:35.000000000 +0200
+--- tetex-bin-3.0.orig/texk/web2c/fmtutil.in 2006-10-12 17:58:00.000000000 +0200
++++ tetex-bin-3.0/texk/web2c/fmtutil.in 2006-10-12 18:09:49.000000000 +0200
@@ -55,7 +55,7 @@
# Change "amstex.ini -> bamstex.ini" and "- -> language.dat"
@@ -329,8 +329,8 @@
# if you want babel support in pdfamstex:
Index: tetex-bin-3.0/texk/web2c/cwebdir/cweb.1
===================================================================
---- tetex-bin-3.0.orig/texk/web2c/cwebdir/cweb.1 2006-10-12 17:49:59.000000000 +0200
-+++ tetex-bin-3.0/texk/web2c/cwebdir/cweb.1 2006-10-12 17:51:35.000000000 +0200
+--- tetex-bin-3.0.orig/texk/web2c/cwebdir/cweb.1 2006-10-12 17:58:00.000000000 +0200
++++ tetex-bin-3.0/texk/web2c/cwebdir/cweb.1 2006-10-12 18:09:49.000000000 +0200
@@ -100,19 +100,19 @@
.
.SH FILES
@@ -358,9 +358,9 @@
.SH "SEE ALSO"
Index: tetex-bin-3.0/texk/tetex/updmap.man
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/updmap.man 2006-10-12 17:49:59.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/updmap.man 2006-10-12 17:57:48.000000000 +0200
-@@ -32,11 +32,21 @@
+--- tetex-bin-3.0.orig/texk/tetex/updmap.man 2006-10-12 17:58:00.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/updmap.man 2006-10-12 18:24:58.000000000 +0200
+@@ -32,11 +32,20 @@
line, \fBupdmap\fP will write generated map files to a directory of
your choosing (via one of the \fB--*outputdir\fP options), or automatically
determine where to place the files\&. In the latter case, it tries to
@@ -375,18 +375,17 @@
+\fB--enable\fP, \fB--disable\fP, or \fB--syncwithtrees\fP,
+\fBupdmap\fP will first write \fBupdmap\&.cfg\fP(5) and regenerate the
+map files only if this file has been changed\&. In Debian, updmap has
-+been adapted so that these options do the "right thing": change the
-+configuration snippets in \fIupdmap.d\fP instead, call
-+\fBupdate-updmap\fP(1) to regenerate \fBupdmap\&.cfg\fP(5) and
++been adapted so that \fB--enable\fP and \fB--diable\fP do the "right
++thing": change the configuration snippets in \fIupdmap.d\fP instead,
++call \fBupdate-updmap\fP(1) to regenerate \fBupdmap\&.cfg\fP(5) and
+regenerate the map files afterwards. There are some limitations,
+though: \fBupdmap\fP will regenerate the map files even if
-+\fBupdmap\&.cfg\fP(5) has not been changed, and \fB--edit\fP does not
-+edit, since it's not clear which file. Instead it issues a warning
-+and shows \fBupdmap\&.cfg\fP(5).
++\fBupdmap\&.cfg\fP(5) has not been changed, and \fB--edit\fP and
++\fB--syncwithtrees\fP cannot be used.
.PP
.SH "OPTIONS"
.PP
-@@ -45,6 +55,14 @@
+@@ -45,6 +54,14 @@
.IP "\fB--cnffile\fP \fIfile\fP"
Specify a configuration \fIfile\fP\&.
.IP
@@ -401,7 +400,7 @@
.IP "\fB--dvipsoutputdir\fP \fIdirectory\fP"
Specify the output
\fIdirectory\fP for map files generated with dvips syntax\&.
-@@ -98,10 +116,10 @@
+@@ -98,10 +115,10 @@
\fBdvipdfmDownloadBase14\fP
.IP
.IP "\fB--enable\fP \fImaptype\fP \fImapfile\fP"
@@ -414,7 +413,7 @@
.IP
.IP "\fB--enable MixedMap=\fP\fImapfile\fP"
Add or enable a MixedMap for \fImapfile\fP\&.
-@@ -126,7 +144,9 @@
+@@ -126,7 +143,9 @@
.IP "\fIupdmap\&.cfg\fP"
Main configuration file\&. In
\fItexmf/web2c\fP by default, but may be located elsewhere
@@ -425,7 +424,7 @@
.IP
.IP "\fIdvips35\&.map\fP"
Map file for standard 35 PostScript fonts for
-@@ -240,7 +260,7 @@
+@@ -240,7 +259,7 @@
.PP
.SH "SEE ALSO"
.PP
@@ -436,8 +435,8 @@
.PP
Index: tetex-bin-3.0/texk/tetex/updmap
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/updmap 2006-10-12 17:51:35.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/updmap 2006-10-12 17:51:35.000000000 +0200
+--- tetex-bin-3.0.orig/texk/tetex/updmap 2006-10-12 18:09:49.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/updmap 2006-10-12 18:23:59.000000000 +0200
@@ -15,6 +15,8 @@
# --nohash do not run texhash
# --nomkmap do not recreate map files
@@ -516,7 +515,22 @@
disableMap()
{
#mapType=`awk '($1 == "MixedMap" || $1 == "Map") && $2 == map { print $1 }' \
-@@ -757,6 +796,19 @@
+@@ -735,12 +774,8 @@
+ !!! ERROR! The map file \`$2' has not been found at all.
+
+ Either put this file into the right place or remove the
+- reference from the configuration file. An automatic way
+- to disable unavailable map files is to call
+- $progname --syncwithtrees
+-
+- For manual editing, call
+- $progname --edit
++ reference from the configuration files - see
++ update-updmap(1).
+ "
+
+ false; return 1
+@@ -757,6 +792,19 @@
rc=$?
$needsCleanup && test -n "$tmpdir" && test -d "$tmpdir" \
&& { cd / && rm -rf "$tmpdir"; }
@@ -536,7 +550,7 @@
(exit $rc); exit $rc
}
-@@ -1038,6 +1090,8 @@
+@@ -1038,6 +1086,8 @@
# update the config file: uncomment all lines which refer to map files that
# are unavailabe in the texmf trees
###############################################################################
@@ -545,7 +559,7 @@
syncWithTrees()
{
for i in `egrep '^(Mixed)?Map' "$cnfFile" | sed 's at .* @@'`; do
-@@ -1051,6 +1105,11 @@
+@@ -1051,6 +1101,11 @@
}
###############################################################################
@@ -557,7 +571,7 @@
# normalizeLines()
# remove comments, whitespace is exactly one space, no empty lines,
# no whitespace at end of line, one space before and after "
-@@ -1274,7 +1333,8 @@
+@@ -1274,7 +1329,8 @@
main()
{
# initialize global variables
@@ -567,19 +581,19 @@
cmd=
log=
-@@ -1333,7 +1393,7 @@
+@@ -1333,7 +1389,7 @@
case "$cmd" in
edit)
- ${VISUAL-${EDITOR-vi}} $cnfFile;;
-+ debianEditWarnAndShow
++ debianEditWarnAndShow;;
setoption)
setOption "$setoptionOpt" "$setoptionVal";;
enable)
Index: tetex-bin-3.0/texk/tetex/updmap-sys
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/updmap-sys 2006-10-12 17:49:59.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/updmap-sys 2006-10-12 17:51:35.000000000 +0200
+--- tetex-bin-3.0.orig/texk/tetex/updmap-sys 2006-10-12 17:58:00.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/updmap-sys 2006-10-12 18:09:49.000000000 +0200
@@ -23,6 +23,7 @@
TEXMFVAR="$v"
@@ -591,8 +605,8 @@
exec updmap ${1+"$@"}
Index: tetex-bin-3.0/texk/tetex/texconfig-sys
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/texconfig-sys 2006-10-12 17:49:59.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/texconfig-sys 2006-10-12 17:51:35.000000000 +0200
+--- tetex-bin-3.0.orig/texk/tetex/texconfig-sys 2006-10-12 17:58:00.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/texconfig-sys 2006-10-12 18:09:49.000000000 +0200
@@ -23,6 +23,7 @@
TEXMFVAR="$v"
@@ -604,8 +618,8 @@
exec texconfig ${1+"$@"}
Index: tetex-bin-3.0/texk/web2c/man/Makefile.in
===================================================================
---- tetex-bin-3.0.orig/texk/web2c/man/Makefile.in 2006-10-12 17:49:59.000000000 +0200
-+++ tetex-bin-3.0/texk/web2c/man/Makefile.in 2006-10-12 17:51:35.000000000 +0200
+--- tetex-bin-3.0.orig/texk/web2c/man/Makefile.in 2006-10-12 17:58:00.000000000 +0200
++++ tetex-bin-3.0/texk/web2c/man/Makefile.in 2006-10-12 18:09:49.000000000 +0200
@@ -38,7 +38,6 @@
dvicopy.1 \
dvitomp.1 \
@@ -616,8 +630,8 @@
gftopk.1 \
Index: tetex-bin-3.0/texk/tetex/texconfig.man
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/texconfig.man 2006-10-12 17:49:59.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/texconfig.man 2006-10-12 17:51:35.000000000 +0200
+--- tetex-bin-3.0.orig/texk/tetex/texconfig.man 2006-10-12 17:58:00.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/texconfig.man 2006-10-12 18:09:49.000000000 +0200
@@ -6,22 +6,52 @@
.SH SYNOPSIS
.B texconfig
More information about the Pkg-tetex-commits
mailing list