Author: frank Date: 2006-10-12 16:04:03 +0000 (Thu, 12 Oct 2006) New Revision: 1797
Modified: tetex-bin/trunk/debian/patches/patch-deb tetex-bin/trunk/debian/rules Log: - change updmap to load debianize-updmap later, in order to also overload syncWithTrees - change manpage of updmap to properly describe Debian changes Modified: tetex-bin/trunk/debian/patches/patch-deb =================================================================== --- tetex-bin/trunk/debian/patches/patch-deb 2006-10-12 15:50:37 UTC (rev 1796) +++ tetex-bin/trunk/debian/patches/patch-deb 2006-10-12 16:04:03 UTC (rev 1797) @@ -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/texconfig | 7 ++--- + texk/tetex/Makefile.in | 10 +++--- + 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 | 62 +++++++++++++++++++++++++++++++++++++++++++-- + texk/tetex/texconfig.man | 46 +++++++++++++++++++++++++------ + texk/tetex/updmap | 66 ++++++++++++++++++++++++++++++++++++++++++--- texk/tetex/updmap-sys | 3 +- - texk/tetex/updmap.man | 33 ++++++++++++++++++----- - texk/web2c/cwebdir/cweb.1 | 10 +++---- + texk/tetex/updmap.man | 36 +++++++++++++++++++----- + texk/web2c/cwebdir/cweb.1 | 10 +++--- texk/web2c/fmtutil.in | 2 - texk/web2c/man/Makefile.in | 1 - 16 files changed, 230 insertions(+), 61 deletions(-) + 16 files changed, 236 insertions(+), 62 deletions(-) Index: tetex-bin-3.0/configure =================================================================== ---- tetex-bin-3.0.orig/configure 2006-10-10 15:05:28.000000000 +0200 -+++ tetex-bin-3.0/configure 2006-10-10 15:05:37.000000000 +0200 +--- 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 @@ -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-10 15:05:28.000000000 +0200 -+++ tetex-bin-3.0/texk/kpathsea/mktexlsr 2006-10-10 15:05:37.000000000 +0200 +--- 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 @@ -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-10 15:05:28.000000000 +0200 -+++ tetex-bin-3.0/texk/make/paths.mk 2006-10-10 15:05:37.000000000 +0200 +--- 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 @@ -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-10 15:05:28.000000000 +0200 -+++ tetex-bin-3.0/texk/tetex/Makefile.in 2006-10-10 15:05:37.000000000 +0200 +--- 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 @@ -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-10 15:05:28.000000000 +0200 -+++ tetex-bin-3.0/texk/tetex/texconfig 2006-10-10 15:05:37.000000000 +0200 +--- 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 @@ -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-10 15:05:28.000000000 +0200 -+++ tetex-bin-3.0/texk/tetex/fmtutil 2006-10-10 15:05:37.000000000 +0200 +--- 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 @@ -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-10 15:05:28.000000000 +0200 -+++ tetex-bin-3.0/texk/tetex/fmtutil-sys 2006-10-10 15:05:37.000000000 +0200 +--- 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 @@ -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-10 15:05:28.000000000 +0200 -+++ tetex-bin-3.0/texk/tetex/fmtutil.man 2006-10-10 15:05:37.000000000 +0200 +--- 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 @@ -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-10 15:05:28.000000000 +0200 -+++ tetex-bin-3.0/texk/web2c/fmtutil.in 2006-10-10 15:05:37.000000000 +0200 +--- 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 @@ -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-10 15:05:28.000000000 +0200 -+++ tetex-bin-3.0/texk/web2c/cwebdir/cweb.1 2006-10-10 15:05:37.000000000 +0200 +--- 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 @@ -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-10 15:05:28.000000000 +0200 -+++ tetex-bin-3.0/texk/tetex/updmap.man 2006-10-10 15:05:37.000000000 +0200 -@@ -32,11 +32,18 @@ +--- 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 @@ 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 @@ -378,12 +378,15 @@ +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 -+regenerate the map files afterwards. Unfortunately, they will be -+regenerated even if \fBupdmap\&.cfg\fP(5) has not been changed. ++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). .PP .SH "OPTIONS" .PP -@@ -45,6 +52,14 @@ +@@ -45,6 +55,14 @@ .IP "\fB--cnffile\fP \fIfile\fP" Specify a configuration \fIfile\fP\&. .IP @@ -398,7 +401,7 @@ .IP "\fB--dvipsoutputdir\fP \fIdirectory\fP" Specify the output \fIdirectory\fP for map files generated with dvips syntax\&. -@@ -98,10 +113,10 @@ +@@ -98,10 +116,10 @@ \fBdvipdfmDownloadBase14\fP .IP .IP "\fB--enable\fP \fImaptype\fP \fImapfile\fP" @@ -411,7 +414,7 @@ .IP .IP "\fB--enable MixedMap=\fP\fImapfile\fP" Add or enable a MixedMap for \fImapfile\fP\&. -@@ -126,7 +141,9 @@ +@@ -126,7 +144,9 @@ .IP "\fIupdmap\&.cfg\fP" Main configuration file\&. In \fItexmf/web2c\fP by default, but may be located elsewhere @@ -422,7 +425,7 @@ .IP .IP "\fIdvips35\&.map\fP" Map file for standard 35 PostScript fonts for -@@ -240,7 +257,7 @@ +@@ -240,7 +260,7 @@ .PP .SH "SEE ALSO" .PP @@ -433,8 +436,8 @@ .PP Index: tetex-bin-3.0/texk/tetex/updmap =================================================================== ---- tetex-bin-3.0.orig/texk/tetex/updmap 2006-10-10 15:05:37.000000000 +0200 -+++ tetex-bin-3.0/texk/tetex/updmap 2006-10-10 15:06:07.000000000 +0200 +--- 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 @@ -15,6 +15,8 @@ # --nohash do not run texhash # --nomkmap do not recreate map files @@ -513,19 +516,7 @@ disableMap() { #mapType=`awk '($1 == "MixedMap" || $1 == "Map") && $2 == map { print $1 }' \ -@@ -385,6 +424,11 @@ - } - - ############################################################################### -+# source Debian-specific changes, superseding the last three functions -+############################################################################### -+. /usr/share/tex-common/debianize-updmap -+ -+############################################################################### - # psADOBE() - # transform fontnames from URW to Adobe - ############################################################################### -@@ -757,6 +801,19 @@ +@@ -757,6 +796,19 @@ rc=$? $needsCleanup && test -n "$tmpdir" && test -d "$tmpdir" \ && { cd / && rm -rf "$tmpdir"; } @@ -545,7 +536,28 @@ (exit $rc); exit $rc } -@@ -1274,7 +1331,8 @@ +@@ -1038,6 +1090,8 @@ + # update the config file: uncomment all lines which refer to map files that + # are unavailabe in the texmf trees + ############################################################################### ++# for Debian, this is superseded by a function defined in debianize-updmap ++# (see below) + syncWithTrees() + { + for i in `egrep '^(Mixed)?Map' "$cnfFile" | sed '[EMAIL PROTECTED] @@'`; do +@@ -1051,6 +1105,11 @@ + } + + ############################################################################### ++# source Debian-specific changes, superseding some functions ++############################################################################### ++. /usr/share/tex-common/debianize-updmap ++ ++############################################################################### + # 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 @@ main() { # initialize global variables @@ -555,10 +567,19 @@ cmd= log= +@@ -1333,7 +1393,7 @@ + + case "$cmd" in + edit) +- ${VISUAL-${EDITOR-vi}} $cnfFile;; ++ 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-10 15:05:28.000000000 +0200 -+++ tetex-bin-3.0/texk/tetex/updmap-sys 2006-10-10 15:05:37.000000000 +0200 +--- 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 @@ -23,6 +23,7 @@ TEXMFVAR="$v" @@ -570,8 +591,8 @@ exec updmap ${1+"$@"} Index: tetex-bin-3.0/texk/tetex/texconfig-sys =================================================================== ---- tetex-bin-3.0.orig/texk/tetex/texconfig-sys 2006-10-10 15:05:28.000000000 +0200 -+++ tetex-bin-3.0/texk/tetex/texconfig-sys 2006-10-10 15:05:37.000000000 +0200 +--- 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 @@ -23,6 +23,7 @@ TEXMFVAR="$v" @@ -583,8 +604,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-10 15:05:28.000000000 +0200 -+++ tetex-bin-3.0/texk/web2c/man/Makefile.in 2006-10-10 15:05:37.000000000 +0200 +--- 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 @@ -38,7 +38,6 @@ dvicopy.1 \ dvitomp.1 \ @@ -595,8 +616,8 @@ gftopk.1 \ Index: tetex-bin-3.0/texk/tetex/texconfig.man =================================================================== ---- tetex-bin-3.0.orig/texk/tetex/texconfig.man 2006-10-10 15:05:28.000000000 +0200 -+++ tetex-bin-3.0/texk/tetex/texconfig.man 2006-10-10 15:05:37.000000000 +0200 +--- 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 @@ -6,22 +6,52 @@ .SH SYNOPSIS .B texconfig Modified: tetex-bin/trunk/debian/rules =================================================================== --- tetex-bin/trunk/debian/rules 2006-10-12 15:50:37 UTC (rev 1796) +++ tetex-bin/trunk/debian/rules 2006-10-12 16:04:03 UTC (rev 1797) @@ -329,7 +329,7 @@ done # needs devscripts in etch or from backports.org - debchange --distribution sarge-backports -b --newversion 3.0-20~bpo.1 "Recompiled for sarge." + debchange --distribution sarge-backports -b --newversion 3.0-22~1~bpo.1 "Recompiled for sarge." debchange --append \ "Add a Build-Depends on sarge's xlibs-dev to prevent linking against XOrg" sed -f debian/sarge/control.sed debian/sarge/control.sid > debian/control _______________________________________________ Pkg-tetex-commits mailing list Pkg-tetex-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-tetex-commits