[subversion-commit] SVN tetex commit + diffs: r223 - in
tetex-bin/branches/changelog_for_unstable/debian: md5sums patches
Frank Küster
frank at costa.debian.org
Fri Oct 14 13:54:41 UTC 2005
Author: frank
Date: 2005-10-14 13:54:41 +0000 (Fri, 14 Oct 2005)
New Revision: 223
Removed:
tetex-bin/branches/changelog_for_unstable/debian/md5sums/05TeXMF.cnf.md5sum
tetex-bin/branches/changelog_for_unstable/debian/md5sums/15Plain.cnf.md5sum
tetex-bin/branches/changelog_for_unstable/debian/md5sums/45TeXinputs.cnf.md5sum
tetex-bin/branches/changelog_for_unstable/debian/md5sums/55Fonts.cnf.md5sum
tetex-bin/branches/changelog_for_unstable/debian/md5sums/65BibTeX.cnf.md5sum
tetex-bin/branches/changelog_for_unstable/debian/md5sums/75DviPS.cnf.md5sum
tetex-bin/branches/changelog_for_unstable/debian/md5sums/85Misc.cnf.md5sum
tetex-bin/branches/changelog_for_unstable/debian/md5sums/90TeXDoc.cnf.md5sum
tetex-bin/branches/changelog_for_unstable/debian/md5sums/95NonPath.cnf.md5sum
tetex-bin/branches/changelog_for_unstable/debian/patches/debconf
tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2004-0888.files
tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2004-0888.old
tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2005-0064.files
tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2005-0064.old
tetex-bin/branches/changelog_for_unstable/debian/patches/patch-deb.files
tetex-bin/branches/changelog_for_unstable/debian/patches/patch-deb.old
tetex-bin/branches/changelog_for_unstable/debian/patches/patch-libtool.files
tetex-bin/branches/changelog_for_unstable/debian/patches/patch-src.files
tetex-bin/branches/changelog_for_unstable/debian/patches/patch-src.old
tetex-bin/branches/changelog_for_unstable/debian/patches/patch-tds.files
tetex-bin/branches/changelog_for_unstable/debian/patches/patch-tds.old
tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoc.files
tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoc.old
tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoctk.files
tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoctk.old
tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texmfcnf.files
tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texmfcnf.old
tetex-bin/branches/changelog_for_unstable/debian/patches/patch-tmp.files
tetex-bin/branches/changelog_for_unstable/debian/patches/patch-xdvi-300109.files
tetex-bin/branches/changelog_for_unstable/debian/patches/patch-xdvi-300109.old
tetex-bin/branches/changelog_for_unstable/debian/patches/patchlist.mk
Log:
merging trunk changes into branch "changelog for unstable": file deletions
Deleted: tetex-bin/branches/changelog_for_unstable/debian/md5sums/05TeXMF.cnf.md5sum
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/md5sums/05TeXMF.cnf.md5sum 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/md5sums/05TeXMF.cnf.md5sum 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,4 +0,0 @@
-f25db81f58ec6271eba7e4dc11da765f 2.0.2-8
-e94ddbfbaacce5da586be595feebf71f 2.0.2-7
-3b2d2ef73d731db452ed1bfdf8eabd4b 1.0.7+20011202
-6fdb6219510d59a78e2bf68a0caff5e5 1.0.7-CVS
Deleted: tetex-bin/branches/changelog_for_unstable/debian/md5sums/15Plain.cnf.md5sum
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/md5sums/15Plain.cnf.md5sum 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/md5sums/15Plain.cnf.md5sum 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,3 +0,0 @@
-88e81a74d28599df75e8acdf712711a0 2.0.2-4.3
-88e81a74d28599df75e8acdf712711a0 2.0.2-11
-88e81a74d28599df75e8acdf712711a0 1.0.7+20011202
Deleted: tetex-bin/branches/changelog_for_unstable/debian/md5sums/45TeXinputs.cnf.md5sum
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/md5sums/45TeXinputs.cnf.md5sum 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/md5sums/45TeXinputs.cnf.md5sum 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,2 +0,0 @@
-f6a1a0dd6b95a742139c3120f3238c81 2.0.2-11
-9411ee616c8423f4f3c32359dee74795 1.0.7+20011202
Deleted: tetex-bin/branches/changelog_for_unstable/debian/md5sums/55Fonts.cnf.md5sum
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/md5sums/55Fonts.cnf.md5sum 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/md5sums/55Fonts.cnf.md5sum 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,3 +0,0 @@
-0a93ffca0492dea8422bdd0c6fd4c3de 2.0.2-4.3
-0a93ffca0492dea8422bdd0c6fd4c3de 2.0.2-11
-0a93ffca0492dea8422bdd0c6fd4c3de 1.0.7+20011202
Deleted: tetex-bin/branches/changelog_for_unstable/debian/md5sums/65BibTeX.cnf.md5sum
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/md5sums/65BibTeX.cnf.md5sum 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/md5sums/65BibTeX.cnf.md5sum 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,3 +0,0 @@
-a3fb54a413f1dfd0d4b6b5b3b9a502d8 2.0.2-4.3
-a3fb54a413f1dfd0d4b6b5b3b9a502d8 2.0.2-11
-a3fb54a413f1dfd0d4b6b5b3b9a502d8 1.0.7+20011202
Deleted: tetex-bin/branches/changelog_for_unstable/debian/md5sums/75DviPS.cnf.md5sum
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/md5sums/75DviPS.cnf.md5sum 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/md5sums/75DviPS.cnf.md5sum 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,2 +0,0 @@
-f2491ed69ebb56e8ba2bcd493d216e97 2.0.2-8
-731d2c9ebf22e8f636f7bad7858ee6d2 1.0.7+20011202
Deleted: tetex-bin/branches/changelog_for_unstable/debian/md5sums/85Misc.cnf.md5sum
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/md5sums/85Misc.cnf.md5sum 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/md5sums/85Misc.cnf.md5sum 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,2 +0,0 @@
-eba0feb6847e356f1f91af9750012626 2.0.2-8
-743d1cefb4f11e48cd8cad1092c1c8ff 1.0.7+20011202
Deleted: tetex-bin/branches/changelog_for_unstable/debian/md5sums/90TeXDoc.cnf.md5sum
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/md5sums/90TeXDoc.cnf.md5sum 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/md5sums/90TeXDoc.cnf.md5sum 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,2 +0,0 @@
-e6a4e65d7832eebce840f1c91df5aa8b 2.0.2-4.3
-7e8f87acdeba48edac16d851c77b9e75 2.0.2-11
Deleted: tetex-bin/branches/changelog_for_unstable/debian/md5sums/95NonPath.cnf.md5sum
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/md5sums/95NonPath.cnf.md5sum 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/md5sums/95NonPath.cnf.md5sum 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,6 +0,0 @@
-e45f13f4289902c57e747b775ce5e7ff 2.0.2-11
-a8ac3041655a550cffa56c1dbf3203b7 2.0.2-8
-5e42201ef8b41fe090b6facdc7e71497 1.0.7+20011202
-a7078537631aeb40e2ca1b175ded2ac5 1.0.7-5
-ecd63d2cb4d1527bd19b37cf98a1f496 2.0
-10a7d60944ad23fc090609baff1f28ee 2.99.9
Deleted: tetex-bin/branches/changelog_for_unstable/debian/patches/debconf
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/debconf 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/debconf 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,62 +0,0 @@
-diff -urN debian.old/config debian/config
---- debian.old/config Wed Dec 31 19:00:00 1969
-+++ debian/config Sun Sep 22 20:06:13 2002
-@@ -0,0 +1,19 @@
-+#!/bin/sh -e
-+
-+# Use debconf.
-+. /usr/share/debconf/confmodule || exit
-+db_version 2.0
-+
-+db_input high tetex-bin/managelsrperms || true
-+db_go
-+
-+db_get tetex-bin/managelsrperms
-+if [ x"$RET" == x"true" ]; then
-+ db_beginblock
-+ db_input medium tetex-bin/groupname || true
-+ db_input low tetex-bin/groupperm || true
-+ db_input low tetex-bin/userperm || true
-+ db_endblock
-+fi
-+
-+db_go
-diff -urN debian.old/templates debian/templates
---- debian.old/templates Wed Dec 31 19:00:00 1969
-+++ debian/templates Sun Sep 22 20:07:54 2002
-@@ -0,0 +1,35 @@
-+Template: tetex-bin/managelsrperms
-+Type: boolean
-+Default: true
-+Description: Use debconf to manage permissions of ls-R files?
-+ The metafont program can store fonts generated by users running xdvi, dvips,
-+ etc. so they need not be re-generated repeatedly. They are stored in
-+ /var/lib/texmf and /var/spool/texmf, with "ls-R" file lists showing where the
-+ font files are stored.
-+ .
-+ Answering `yes' here will allow you to easily manage the permissions of those
-+ ls-R files using debconf.
-+
-+Template: tetex-bin/groupname
-+Type: string
-+Default: users
-+Description: Which group should own the ls-R files?
-+ Modification of ls-R files can be restricted to the members of one group which
-+ owns them. To take advantage of this, add the users to the group of your
-+ choice, and enter that group name here. The default group `users' is
-+ appropriate for most systems.
-+
-+Template: tetex-bin/groupperm
-+Type: boolean
-+Default: true
-+Description: Allow group members to modify ls-R files?
-+ Answering `yes' here will allow members of the owning group to modify the ls-R
-+ files.
-+
-+Template: tetex-bin/userperm
-+Type: boolean
-+Default: false
-+Description: Allow all users to modify ls-R files?
-+ Answering `yes' here will allow all users to modify ls-R files. This is
-+ generally not a good idea for security reasons; you should instead restrict
-+ such access to members of one group.
Deleted: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2004-0888.files
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2004-0888.files 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2004-0888.files 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,2 +0,0 @@
-libs/xpdf/xpdf/Catalog.cc
-libs/xpdf/xpdf/XRef.cc
Deleted: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2004-0888.old
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2004-0888.old 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2004-0888.old 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,51 +0,0 @@
---- libs/xpdf/xpdf/Catalog.cc.CAN-2004-0888 2004-01-22 02:26:45.000000000 +0100
-+++ libs/xpdf/xpdf/Catalog.cc 2005-02-08 09:53:47.921263552 +0100
-@@ -64,6 +64,12 @@ Catalog::Catalog(XRef *xrefA) {
- }
- pagesSize = numPages0 = (int)obj.getNum();
- obj.free();
-+ if (pagesSize*(int)sizeof(Page *)/sizeof(Page *) != pagesSize ||
-+ pagesSize*(int)sizeof(Ref)/sizeof(Ref) != pagesSize) {
-+ error(-1, "Invalid 'pagesSize'");
-+ ok = gFalse;
-+ return;
-+ }
- pages = (Page **)gmalloc(pagesSize * sizeof(Page *));
- pageRefs = (Ref *)gmalloc(pagesSize * sizeof(Ref));
- for (i = 0; i < pagesSize; ++i) {
-@@ -191,6 +197,11 @@ int Catalog::readPageTree(Dict *pagesDic
- }
- if (start >= pagesSize) {
- pagesSize += 32;
-+ if (pagesSize*(int)sizeof(Page *)/sizeof(Page *) != pagesSize ||
-+ pagesSize*(int)sizeof(Ref)/sizeof(Ref) != pagesSize) {
-+ error(-1, "Invalid 'pagesSize' parameter.");
-+ goto err3;
-+ }
- pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *));
- pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref));
- for (j = pagesSize - 32; j < pagesSize; ++j) {
---- libs/xpdf/xpdf/XRef.cc.CAN-2004-0888 2005-01-19 13:09:57.000000000 +0100
-+++ libs/xpdf/xpdf/XRef.cc 2005-02-08 09:42:59.942771256 +0100
-@@ -718,6 +718,10 @@ GBool XRef::constructXRef() {
- error(-1, "Bad object number");
- return gFalse;
- }
-+ if (newSize*(int)sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
-+ error(-1, "Invalid 'obj' parameters.");
-+ return gFalse;
-+ }
- entries = (XRefEntry *)
- grealloc(entries, newSize * sizeof(XRefEntry));
- for (i = size; i < newSize; ++i) {
-@@ -741,6 +745,10 @@ GBool XRef::constructXRef() {
- } else if (!strncmp(p, "endstream", 9)) {
- if (streamEndsLen == streamEndsSize) {
- streamEndsSize += 64;
-+ if (streamEndsSize*(int)sizeof(int)/sizeof(int) != streamEndsSize) {
-+ error(-1, "Invalid 'endstream' parameter.");
-+ return gFalse;
-+ }
- streamEnds = (Guint *)grealloc(streamEnds,
- streamEndsSize * sizeof(int));
- }
Deleted: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2005-0064.files
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2005-0064.files 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2005-0064.files 2005-10-14 13:54:41 UTC (rev 223)
@@ -1 +0,0 @@
-libs/xpdf/xpdf/Decrypt.cc
Deleted: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2005-0064.old
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2005-0064.old 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2005-0064.old 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,12 +0,0 @@
---- libs/xpdf/xpdf/Decrypt.cc.CAN-2005-0064 2004-01-22 02:26:45.000000000 +0100
-+++ libs/xpdf/xpdf/Decrypt.cc 2005-02-08 10:09:10.899949464 +0100
-@@ -135,6 +135,9 @@ GBool Decrypt::makeFileKey2(int encVersi
- int len, i, j;
- GBool ok;
-
-+ // truncate keyLength when it won't fit tmpKey
-+ keyLength = keyLength > sizeof(tmpKey) ? sizeof(tmpKey) : keyLength;
-+
- // generate file key
- buf = (Guchar *)gmalloc(68 + fileID->getLength());
- if (userPassword) {
Deleted: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-deb.files
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-deb.files 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-deb.files 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,11 +0,0 @@
-configure
-texk/kpathsea/mktexlsr
-texk/make/paths.mk
-texk/tetex/Makefile.in
-texk/tetex/texconfig
-texk/tetex/fmtutil
-texk/tetex/fmtutil-sys
-texk/tetex/fmtutil.man
-texk/web2c/fmtutil.in
-texk/web2c/cwebdir/cweb.1
-texk/tetex/updmap.man
Deleted: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-deb.old
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-deb.old 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-deb.old 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,257 +0,0 @@
---- configure.orig 2005-08-02 18:54:28.865653519 +0200
-+++ configure 2005-08-02 18:54:28.956643478 +0200
-@@ -4213,12 +4213,13 @@
-
-
- # initialize texmf tree with fmtutil only for teTeX and TeX Live
--if test ! -d $srcdir/texk/tetex || test -n "$xdvik_standalone" || test "x$cross_compiling" = xyes; then
-- FMU=
--else
-- FMU='# '
--fi
--
-+# if test ! -d $srcdir/texk/tetex || test -n "$xdvik_standalone" || test "x$cross_compiling" = xyes; then
-+# FMU=
-+# else
-+# FMU='# '
-+# fi
-+# For Debian, we don't need this - we initialize in postinst
-+FMU=
-
- # more customizations for standalone xdvik
- if test -z "$xdvik_standalone"; then
---- texk/kpathsea/mktexlsr.orig 2005-08-02 18:54:28.868653188 +0200
-+++ texk/kpathsea/mktexlsr 2005-08-02 18:54:28.958643257 +0200
-@@ -103,9 +103,9 @@
- db_dir=`echo "$db_file" | sed 's%/[^/][^/]*$%%'` # can't rely on dirname
-
- test -d "$db_dir" || continue
-- test -w "$db_dir" || { echo "$progname: $db_dir: directory not writable. Skipping..." >&2; continue; }
-
- if test ! -f "$db_file"; then
-+ test -w "$db_dir" || { echo "$progname: $db_dir: directory not writable. Skipping..." >&2; continue; }
- cp /dev/null "$db_file"
- # Use same permissions as parent directory, minus x,s, or t bits.
- chmod `kpsestat -xst "$db_dir"` "$db_file"
-@@ -119,11 +119,8 @@
- # Skip if we cannot write the file:
- kpseaccess -w "$db_file" || { echo "$progname: $db_file: no write permission. Skipping..." >&2; continue; }
-
-- db_dir_tmp="$db_dir/lsR$$.tmp"
-- (umask 077 && mkdir "$db_dir_tmp" ) \
-- || { echo "$progname: could not create directory '$db_dir_tmp'. Skipping..." >&2; continue; }
-- db_file_tmp="$db_dir_tmp/lsR$$.tmp"
-- rm -f "$db_file_tmp"
-+ db_file_tmp=`tempfile -p ls-R` \
-+ || { echo "$progname: could not create temporary file for '$db_file'. Skipping..." >&2; continue; }
-
- tty -s && echo "$progname: Updating $db_file... " >&2
- echo "$ls_R_magic" >"$db_file_tmp"
-@@ -137,12 +134,8 @@
- (cd "$TEXMFLS_R" && \ls -LRa 2>/dev/null) |
- sed '/^$/{n;s%^\./%%;s%^%./%;}; /^\.$/d; /^\.\.$/d; /^[\.\/]*lsR[0-9]*\.tmp:*$/d' >>"$db_file_tmp"
-
-- # To be really safe, a loop.
-- until PERMS=`kpsestat = "$db_file"`; do sleep 1; done
-- chmod $PERMS "$db_file_tmp"
-- rm -f "$db_file"
-- mv "$db_file_tmp" "$db_file"
-- rm -rf "$db_dir_tmp"
-+ cat "$db_file_tmp" > "$db_file"
-+ rm -f "$db_file_tmp"
- done
- tty -s && echo "$progname: Done." >&2
- exit 0
---- texk/make/paths.mk.orig 2005-08-02 18:54:28.872652747 +0200
-+++ texk/make/paths.mk 2005-08-02 18:54:28.959643147 +0200
-@@ -47,7 +47,7 @@
- texmf = @texmfmain@
-
- # The directory used by varfonts.
--vartexfonts = /var/tmp/texfonts
-+vartexfonts = /var/spool/texmf
-
- # Regular input files.
- texinputdir = $(texmf)/tex
---- texk/tetex/Makefile.in.orig 2005-08-02 18:54:28.875652416 +0200
-+++ texk/tetex/Makefile.in 2005-08-02 18:54:28.960643036 +0200
-@@ -35,7 +35,7 @@
-
- # Auxiliary files.
- install-data:: $(INFOFILES)
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(man5dir) $(texpooldir) $(texmf)/doc/tetex
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(man5dir) $(texpooldir) $(texmf)/../doc/texmf/tetex
- for p in $(manpgs); do \
- $(INSTALL_DATA) $(srcdir)/$$p.man $(man1dir)/$$p.$(manext); \
- done
-@@ -72,7 +72,7 @@
- $(INSTALL_DATA) $(srcdir)/$$p $(texpooldir)/$$p; \
- done
- for p in TETEXDOC.pdf TETEXDOC.ps TETEXDOC.dvi teTeX-FAQ; do \
-- $(INSTALL_DATA) $(srcdir)/doc/$$p $(texmf)/doc/tetex; \
-+ $(INSTALL_DATA) $(srcdir)/doc/$$p $(texmf)/../doc/texmf/tetex; \
- done
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/texconfig $(texmf)/texconfig/g $(texmf)/texconfig/v $(texmf)/texconfig/x
- $(INSTALL_DATA) $(srcdir)/texmf/texconfig/g/generic $(texmf)/texconfig/g
---- texk/tetex/texconfig.orig 2005-08-02 18:54:28.878652085 +0200
-+++ texk/tetex/texconfig 2005-08-02 18:54:28.962642816 +0200
-@@ -883,8 +883,8 @@
-
- faq)
- setupTexmfmain
-- if test -f $MT_TEXMFMAIN/doc/tetex/teTeX-FAQ; then
-- <$MT_TEXMFMAIN/doc/tetex/teTeX-FAQ eval ${PAGER-more}
-+ if test -f $MT_TEXMFMAIN/doc/tetex/teTeX-FAQ.gz; then
-+ <$MT_TEXMFMAIN/doc/tetex/teTeX-FAQ.gz eval zcat | ${PAGER-sensible-pager}
- else
- echo "$progname: faq not found (usually in \$TEXMFMAIN/doc/tetex/teTeX-FAQ)" >&2
- rc=1
-@@ -923,6 +923,7 @@
- if test -n "$tfc"; then
- if test -w "$tfc"; then
- configReplace "$tfc" '^VARTEXFONTS' "VARTEXFONTS = $tcBatchFontVardir"
-+ /usr/sbin/update-texmf || true
- else
- echo "$progname: setting up vardir failed. Reason: no permission to write file \`$tfc'" >&2
- rc=1
---- texk/tetex/fmtutil.orig 2005-08-02 18:54:28.882651643 +0200
-+++ texk/tetex/fmtutil 2005-08-02 18:54:28.966642374 +0200
-@@ -25,7 +25,13 @@
- # --cnffile file set configfile for fmtutil
- # --fmtdir directory set destination directory for format files
- ###############################################################################
--
-+###############################################################################
-+#
-+# Debian-specific options:
-+# --root-home Don't use TEXMFSYSVAR, TEXMFSYSCONFIG even when
-+# called by root
-+#
-+###############################################################################
- ###############################################################################
- # program history:
- # Sa Jan 15 18:13:46 CET 2005 avoid multiple variable assignments in one statement
-@@ -76,13 +82,31 @@
- # hack around a bug in zsh:
- test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
-
--progname=fmtutil
-+: ${progname:=fmtutil}
- argv0=$0
- version=1105809354 # seconds since `00:00:00 1970-01-01 UTC'
- # date '+%s' (with GNU date)
-
- cnf=fmtutil.cnf # name of the config file
-
-+if [ `id -u` -eq 0 ]; then
-+ if [ "$1" = "--root-home" ]; then
-+ echo
-+ echo "$progname: Option --root-home given,"
-+ echo "generating formats in /root/.texmf-var."
-+ echo
-+ else
-+ echo
-+ echo "Warning: fmtutil is being run as root; fmtutil-sys should probably be"
-+ echo "used instead. If this is done by a Debian package upon installation,"
-+ echo "upgrade, or removal, please file a bug against that package."
-+ echo
-+ TEXMFVAR="`kpsewhich -var-value TEXMFSYSVAR`"
-+ TEXMFCONFIG="`kpsewhich -var-value TEXMFSYSCONFIG`"
-+ export TEXMFVAR TEXMFCONFIG
-+ fi
-+fi
-+
- ###############################################################################
- # cleanup()
- # clean up the temp area and exit with proper exit status
---- texk/tetex/fmtutil.man.orig 2005-08-02 18:54:28.888650981 +0200
-+++ texk/tetex/fmtutil.man 2005-08-02 18:54:28.967642264 +0200
-@@ -53,6 +53,15 @@
- (not implemented, just for compatibility)
- .IP "\fB--test\fP"
- (not implemented, just for compatibility)
-+.PP
-+.SH "DEBIAN-SPECIFIC CHANGES"
-+.PP
-+In Debian. \fBfmtutil\fP acts on the system-wide format files if it is
-+called by root (actually, by numerical UID 0). If you want to create
-+user-specific formats for root, use
-+.PP
-+.IP "\fB\-\-root\-home\fP"
-+Don't use TEXMFSYSVAR, TEXMFSYSCONFIG even when called by root.
- .PP
- .SH "FILES"
- .PP
---- texk/web2c/fmtutil.in.orig 2005-08-02 18:54:28.891650650 +0200
-+++ texk/web2c/fmtutil.in 2005-08-02 18:54:28.968642154 +0200
-@@ -55,7 +55,7 @@
-
- # Change "amstex.ini -> bamstex.ini" and "- -> language.dat"
- # if you want babel support in amstex:
--#! amstex pdfetex - -translate-file=cp227.tcx *amstex.ini
-+amstex pdfetex - -translate-file=cp227.tcx *amstex.ini
-
- # Change "pdfamstex.ini -> pdfbamstex.ini" and "- -> language.dat"
- # if you want babel support in pdfamstex:
---- texk/web2c/cwebdir/cweb.1.orig 2005-08-02 18:54:28.894650319 +0200
-+++ texk/web2c/cwebdir/cweb.1 2005-08-02 18:54:28.969642043 +0200
-@@ -100,19 +100,19 @@
- .
- .SH FILES
- .TP
--/usr/local/lib/tex/inputs/cwebmac.tex
-+/usr/share/texmf/tex/plain/base/cwebmac.tex
- TeX macros used by cweave output.
- .TP
--/usr/local/src/cweb/cwebman.tex
-+/usr/share/doc/texmf/programs/cwebman.dvi.gz
- The user manual.
- .TP
--/usr/local/src/cweb/examples/wc.w
-+/usr/share/doc/texmf/programs/cweb-examples/wc.w.gz
- An introductory example.
- .TP
--/usr/local/src/cweb/examples/wmerge.w
-+/usr/share/doc/texmf/programs/cweb-examples/wmerge.w.gz
- Patch program based on CWEB-style change files.
- .TP
--/usr/local/lib/cweb
-+/usr/share/texmf/cweb
- Directory for cweb "include" files.
- .
- .SH "SEE ALSO"
---- texk/tetex/updmap.man.orig 2005-08-02 18:54:28.897649988 +0200
-+++ texk/tetex/updmap.man 2005-08-02 18:54:28.970641933 +0200
-@@ -98,10 +98,10 @@
- \fBdvipdfmDownloadBase14\fP
- .IP
- .IP "\fB--enable\fP \fImaptype\fP \fImapfile\fP"
--Add or enable a \fBMap\fP or \fBMixedMap\fP for \fImapfile\fP\&.
-+Permanently add or enable a \fBMap\fP or \fBMixedMap\fP for \fImapfile\fP\&.
- .IP
- .IP "\fB--enable Map=\fImapfile\fP"
--Add or enable a Map for \fImapfile\fP\&.
-+Permanently add or enable a Map for \fImapfile\fP\&.
- .IP
- .IP "\fB--enable MixedMap=\fP\fImapfile\fP"
- Add or enable a MixedMap for \fImapfile\fP\&.
-@@ -126,7 +126,9 @@
- .IP "\fIupdmap\&.cfg\fP"
- Main configuration file\&. In
- \fItexmf/web2c\fP by default, but may be located elsewhere
--depending on your distribution\&.
-+depending on your distribution\&. \fBNote for Debian\fP: On Debian
-++ that file is generated out of files in \fI/etc/texmf/updmap.d\fP.
-++ See \fBupdate-updmap\fP(8) or \fIREADME.Debian\fP.
- .IP
- .IP "\fIdvips35\&.map\fP"
- Map file for standard 35 PostScript fonts for
-@@ -240,7 +242,7 @@
- .PP
- .SH "SEE ALSO"
- .PP
--\fBupdmap\&.cfg\fP(5), \fBdvipdfm\fP(1), \fBdvips\fP(1),
-+\fBupdmap\&.cfg\fP(5), \fBupdate-updmap\fP(8), \fBdvipdfm\fP(1), \fBdvips\fP(1),
- \fBgsftopk\fP(1), \fBpdftex\fP(1), \fBps2pk\fP(1),
- \fBtexhash\fP(1), \fBxdvi\fP(1)\&.
- .PP
Deleted: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-libtool.files
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-libtool.files 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-libtool.files 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,3 +0,0 @@
-texk/libtool.m4
-texk/configure
-texk/kpathsea/configure
Deleted: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-src.files
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-src.files 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-src.files 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,3 +0,0 @@
-texk/dvipdfm/Makefile.in
-texk/dvipdfm/dvipdfm.c
-texk/dvipdfm/dvipdfm.1
Deleted: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-src.old
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-src.old 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-src.old 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,132 +0,0 @@
---- texk/dvipdfm/Makefile.in.orig.0 Fri Feb 4 15:24:40 2005
-+++ texk/dvipdfm/Makefile.in Fri Feb 4 15:24:40 2005
-@@ -12,7 +12,10 @@
- LIBPNGDEP = @LIBPNGDEP@
- LDLIBPNG = @LDLIBPNG@
-
--LD_ALL_LIBS = $(LDLIBPNG) $(LDZLIB)
-+#PAPERLIBDEP = "-L /usr/lib"
-+LDLIBPAPER = "-lpaper"
-+
-+LD_ALL_LIBS = $(LDLIBPNG) $(LDZLIB) $(LDLIBPAPER)
- ALL_LIBS_DEP = $(ZLIBDEP) $(LIBPNGDEP)
-
- program = dvipdfm
-@@ -29,7 +32,7 @@
- pngimage.o
-
- $(program): $(objects) $(kpathsea) $(ALL_LIBS_DEP)
-- $(kpathsea_link) $(objects) $(LD_ALL_LIBS) $(LOADLIBES)
-+ $(kpathsea_link) $(objects) $(LD_ALL_LIBS) $(LOADLIBES) -lpaper
-
- ebb: $(eobjects) $(kpathsea) $(ALL_LIBS_DEP)
- $(kpathsea_link) $(eobjects) $(LD_ALL_LIBS) $(LOADLIBES)
---- texk/dvipdfm/dvipdfm.c.orig.0 Fri Feb 4 15:24:40 2005
-+++ texk/dvipdfm/dvipdfm.c Fri Feb 4 15:24:40 2005
-@@ -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 +63,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 +126,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 +381,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 +521,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 +591,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);
-
---- texk/dvipdfm/dvipdfm.1.orig.0 Fri Feb 4 15:24:40 2005
-+++ texk/dvipdfm/dvipdfm.1 Fri Feb 4 15:24:40 2005
-@@ -139,7 +139,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
Deleted: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-tds.files
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-tds.files 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-tds.files 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,2 +0,0 @@
-texk/tetex/updmap
-texk/kpathsea/texmf.in-teTeX
Deleted: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-tds.old
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-tds.old 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-tds.old 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,63 +0,0 @@
---- texk/tetex/updmap.orig.0 Fri Feb 4 15:37:04 2005
-+++ texk/tetex/updmap Fri Feb 4 15:37:04 2005
-@@ -635,12 +635,15 @@
- else
- if test -f "$file2"; then
- # bad: map file exists in the wrong location only
-+ # Debian: this will be tolerated for a while.
- mapWarn badLocation "$map" "$file2"
-+ file="$file2"
-+ echo "$file"
- else
- # bad: map file does not exist at all
- mapWarn notFound "$map"
-+ false; return 1
- fi
-- false; return 1
- fi
- done
- true; return 0
-@@ -709,7 +712,12 @@
- instead.
-
- To fix this, please move this file into an appropriate
-- subdirectory of fonts/map in one of your texmf trees.
-+ subdirectory of fonts/map in one of your texmf trees. If
-+ the file has been installed by a Debian package, please do
-+ not move it. Instead, please report a bug against that package,
-+ and send a copy of that bug to
-+
-+ debian-tetex-maint at lists.debian.org
-
- For more information about the changed search paths, see
- the release notes section in the teTeX manual. You probably
-@@ -719,7 +727,8 @@
- http://tug.org/texlive/mapenc.html
- "
- warn "$m"
-- false; return 1
-+# false; return 1
-+ true; return 0
- ;;
- notFound)
- warn "
---- texk/kpathsea/texmf.in-teTeX.orig.0 Fri Feb 4 15:37:04 2005
-+++ texk/kpathsea/texmf.in-teTeX Fri Feb 4 15:37:04 2005
-@@ -260,7 +260,7 @@
- MISCFONTS = .;$TEXMF/fonts/misc//
-
- % font name map files.
--TEXFONTMAPS = .;$TEXMF/fonts/map//
-+TEXFONTMAPS = .;$TEXMF/fonts/map//;$TEXMF/dvips//
-
- % support non"k"-xdvi:
- PKFONTS.XDvi = .:$TEXMF/%s:$VARTEXFONTS/pk/{%m,modeless}//
-@@ -302,7 +302,7 @@
- INDEXSTYLE = .;$TEXMF/makeindex//
-
- % Font encoding files (.enc).
--ENCFONTS = .;$TEXMF/fonts/enc//
-+ENCFONTS = .;$TEXMF/fonts/enc//;$TEXMF/dvips//
-
- % CMap files.
- CMAPFONTS = .;$TEXMF/fonts/cmap//
Deleted: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoc.files
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoc.files 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoc.files 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,2 +0,0 @@
-texk/tetex/texdoc
-texk/tetex/texdoc.man
Deleted: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoc.old
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoc.old 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoc.old 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,203 +0,0 @@
---- texk/tetex/texdoc.orig 2005-03-24 17:52:17.000000000 +0100
-+++ texk/tetex/texdoc 2005-03-24 17:52:17.000000000 +0100
-@@ -17,6 +17,15 @@
- #
- # Support for compressed documentation implemented by adopting changes
- # made by debian. Thomas Esser, Dec. 2004.
-+#
-+# Debian specific changes:
-+# Denis Barbier <barbier at imacs.polytechnique.fr>, Feb 15 2000
-+# * accept gzipped files on input
-+# * temporary directory set according to TMPDIR
-+#
-+# Frank Küster <frank at debian.org>, 2004-11-23
-+# * do not uncompress dvi.gz, xdvi can handle this
-+# * go to background with uncompressed files
-
- test -f /bin/sh5 && test -z "$RUNNING_SH5" \
- && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
-@@ -28,22 +37,22 @@
- && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; }
- unset RUNNING_BSH
-
--needsCleanup=false
-+# needsCleanup=false
- progname=texdoc
--tmpdir=${TMP-/tmp}/$progname.$$
-+# tmpdir=${TMP-/tmp}/$progname.$$
-
- ###############################################################################
- # setupTmpDir()
- # set up a temp directory and a trap to remove it
- ###############################################################################
--setupTmpDir()
--{
-- $needsCleanup && return
-+# setupTmpDir()
-+# {
-+# $needsCleanup && return
-
-- trap 'cleanup --force' 1 2 3 7 13 15
-- needsCleanup=true
-- mkdir "$tmpdir" || abort "could not create directory \`$tmpdir'"
--}
-+# trap 'cleanup --force' 1 2 3 7 13 15
-+# needsCleanup=true
-+# mkdir "$tmpdir" || abort "could not create directory \`$tmpdir'"
-+# }
-
- ###############################################################################
- # abort(errmsg)
-@@ -63,15 +72,21 @@
- ###############################################################################
- cleanup()
- {
-- case $1 in
-- --force)
-- $needsCleanup && test -n "$tmpdir" && test -d "$tmpdir" \
-- && { rm -f "$tmpdir"/*; cd /; rmdir "$tmpdir"; }
-- ;;
-- *) # directory might not be empty if some other viewer is still
-- # running, so be quiet about it
-- rmdir $tmpdir >/dev/null 2>&1;;
-- esac
-+# case $1 in
-+# --force)
-+# $needsCleanup && test -n "$tmpdir" && test -d "$tmpdir" \
-+# && { rm -f "$tmpdir"/*; cd /; rmdir "$tmpdir"; }
-+# ;;
-+# *) # directory might not be empty if some other viewer is still
-+# # running, so be quiet about it
-+# rmdir $tmpdir >/dev/null 2>&1;;
-+# esac
-+ # is the temporary directory empty? If not, texdoc was called with
-+ # two or more arguments, and one viewer is still running
-+ if test "`echo $tmpdir/*`" = $tmpdir/'*'
-+ then
-+ rm -rf $tmpdir
-+ fi
- }
-
-
-@@ -90,12 +105,11 @@
- ;;
- *)
- : ${TEXDOCVIEW_dvi='(xdvi %s) &'}
-- : ${TEXDOCVIEW_pdf='(acroread %s) &'}
-- : ${TEXDOCVIEW_ps='(gv %s) &'}
-- : ${TEXDOCVIEW_html='mozilla -remote openURL'"'(%s)'"' 2>/dev/null || mozilla %s &'}
-- : ${TEXDOCVIEW_txt="${PAGER-more} %s"}
-- : ${TEXDOCVIEW_="${PAGER-more} %s"} # no extension, default to pager
-- extlist='.dvi .dvi.gz .dvi.bz2 .pdf .pdf.gz .pdf.bz2 .ps .ps.gz .ps.bz2 .txt .txt.gz .txt.bz2 .html'
-+ : ${TEXDOCVIEW_pdf='(see %s) &'}
-+ : ${TEXDOCVIEW_ps='(see %s) &'}
-+ : ${TEXDOCVIEW_html='(see %s) &'}
-+ : ${TEXDOCVIEW_txt="${PAGER:-sensible-pager} %s"}
-+ : ${TEXDOCVIEW_="${PAGER:-sensible-pager} %s"} # no extension, default to pager
-
- # Commands run to uncompress files, according to filename extension.
- : ${TEXDOCUNZIP_gz='gzip -d -c'}
-@@ -103,6 +117,10 @@
- ;;
- esac
-
-+extlist=`kpsewhich --expand-brace='$TEXDOCEXT' | tr ':' ' '`
-+test -z "$extlist" && \
-+extlist='.dvi .dvi.gz .dvi.bz2 .pdf .pdf.gz .pdf.bz2 .ps .ps.gz .ps.bz2 .txt .txt.gz .txt.bz2 .html'
-+
- mode=viewer
- help='Usage: texdoc [OPTION]... [NAME]...
- Search for NAME in the TeX documentation and start a viewer.
-@@ -134,11 +152,14 @@
- ;;
- esac
-
-+tmpdir=`mktemp -d -t texdoc.XXXXXXXX`
-+trap 'rc=$?; cleanup; exit $rc' 1 2 6 13 15
-+
- for name
- do
- case $mode in
- search)
-- find `kpsewhich --expand-path='$TEXMF/doc' | tr : ' '` -type f -print |
-+ find `kpsewhich --expand-path='$TEXMF/doc' | tr : ' '` -follow -type f -print |
- egrep $name
- continue
- ;;
-@@ -151,7 +172,6 @@
-
- found=false
- for ext in "" $extlist; do
--
- filename=`kpsewhich -format='TeX system documentation' $name$ext 2>/dev/null`
- test -z "$filename" && continue
- found=true
-@@ -175,7 +195,6 @@
- # than once
- test -f "$tmpdir/$src" && break
-
-- setupTmpDir
- eval "$uncompress $filename > $tmpdir/$src"
- filename=$tmpdir/$src
- viewer=`eval echo $viewer | sed -e "s|%s|$filename; rm -f $filename; cleanup|"`
---- texk/tetex/texdoc.man.orig 2005-03-24 17:52:17.000000000 +0100
-+++ texk/tetex/texdoc.man 2005-03-24 17:55:06.000000000 +0100
-@@ -28,12 +28,16 @@
- .PP
- .SH "OPTIONS"
- .PP
--.IP "\fB--help\fP"
-+.IP "\fB\-\-help\fP"
- Display a brief summary of options\&.
- .IP
--.IP "\fB-l\fP"
-+.IP "\fB\-l\fP"
- List matching files\&. Does not start a viewer\&.
--.IP "\fB-v\fP"
-+.PP
-+.IP "\fB\-s\fP"
-+Search the disk. Remaining arguments will be passed as egrep patterns
-+to filter the list of files in TeX documentation trees.
-+.IP "\fB\-v\fP"
- Sets verbose mode\&. Shows the command being used to
- display the documentation\&.
- .PP
-@@ -42,14 +46,18 @@
- .IP "\fB$TEXDOCVIEW_dvi\fP"
- DVI viewer\&. Defaults to \fBxdvi\fP(1)\&.
- .IP "\fB$TEXDOCVIEW_pdf\fP"
--PDF viewer\&. Defaults to \fBacroread\fP(1)\&.
-+PDF viewer\&. The default is to use the program defined in the
-+\fImailcap\fP file, see \fBmailcap\fP(5)\&.
- .IP "\fB$TEXDOCVIEW_ps\fP"
--PostScript viewer\&. Defaults to
-+PostScript viewer\&. The default is to use the program defined in the
-+\fImailcap\fP file, see \fBmailcap\fP(5)\&.
- \fBghostview\fP(1)\&.
- .IP "\fB$TEXDOCVIEW_html\fP"
--HTML viewer\&. Defaults to \fBnetscape\fP(1)\&.
-+HTML viewer\&. The default is to use the program defined in the
-+\fImailcap\fP file, see \fBmailcap\fP(5)\&.
- .IP "\fB$TEXDOCVIEW_txt\fP"
--Text viewer\&. Defaults to \fB$PAGER-more\fP\&.
-+Text viewer\&. Defaults is to use the program indicated by the
-+\fB$PAGER\fP variable, or \fBmore\fP if this is unset\&.
- .PP
- The environment variables should be set with a ``%s\&'\&' as a placeholder
- for the name of the file\&. For example,
-@@ -66,6 +74,15 @@
- hostname$ export TEXDOCVIEW_html
- .EE
- .PP
-+.SH "SPECIFIC TO DEBIAN"
-+.PP
-+The Debian teTeX packages texdoc use the mime-support package to determine
-+the appropriate viewer for the respective file type except for
-+\fIdvi\fP and \fItxt\fP. texdoc of Debian is able to handle gzip- and
-+bzip2-compressed files. If texdoc finds more than on file for a string
-+the first hit is displayed. The file extensions are regarded and the
-+search order can be configured in \fItexmf.cnf\fP (\fI90TeXDoc.cnf\fP).
-+.PP
- .SH "SEE ALSO"
- .PP
- \fBacroread\fP(1), \fBgv\fP(1), \fBkpsewhich\fP(1),
Deleted: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoctk.files
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoctk.files 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoctk.files 2005-10-14 13:54:41 UTC (rev 223)
@@ -1 +0,0 @@
-texk/tetex/texdoctk
Deleted: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoctk.old
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoctk.old 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoctk.old 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,52 +0,0 @@
---- texk/tetex/texdoctk.orig.0 Wed Feb 9 11:57:51 2005
-+++ texk/tetex/texdoctk Wed Feb 9 11:57:51 2005
-@@ -9,11 +9,30 @@
- # and the full disclaimer.
- ###############################################################################
- use strict;
--use Tk;
- use Getopt::Long;
- Getopt::Long::config('bundling');
- use File::Basename;
-
-+BEGIN {
-+ eval { require Tk; import Tk; };
-+ if ($@) {
-+ my $progname = basename($0);
-+ my $message;
-+ if ($@ =~ /^Can\'t locate Tk\.pm/) {
-+ $message = "$progname: you must have the perl-tk package installed\nto use this script\n";
-+ } else {
-+ $message = "$progname: problem loading the Tk module:\n $@\nHave you installed the perl-tk package?\n";
-+ }
-+
-+ if (! -t STDOUT and exists $ENV{DISPLAY})
-+ {
-+ exec("tetex-xwarn", $message);
-+ } else {
-+ die $message;
-+ }
-+ }
-+}
-+
- my $IsWin32 = ($^O =~ /MSWin32/i);
-
- #if ($IsWin32) {
-@@ -42,7 +61,7 @@
- # defaults: unix values
- my $qq="'";
- my $HomeEnv=$ENV{HOME};
--my $TeXDocRcDefaults="texdocrc.defaults";
-+my $TeXDocRcDefaults="texdocrc";
- my $TempDir; $TempDir=$ENV{TMPDIR} or $TempDir="/tmp";
- my $CmdConsole="xterm -e ";
-
-@@ -59,7 +78,7 @@
-
- my ($line, at dummy);
- my @tmpfiles;
--# read system-wide defaults from texdocrc.defaults
-+# read system-wide defaults from texdocrc
- my $sysrc=`kpsewhich --progname=texdoctk --format=${qq}other text files${qq} ${TeXDocRcDefaults}`;
- my $database=`kpsewhich --progname=texdoctk --format=${qq}other text files${qq} texdoctk.dat`;
- my $locdatabase=`kpsewhich --progname=texdoctk --format=${qq}other text files${qq} texdoctk-local.dat`;
Deleted: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texmfcnf.files
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texmfcnf.files 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texmfcnf.files 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,2 +0,0 @@
-texk/kpathsea/texmf.in-teTeX
-texk/kpathsea/Makefile.in
Deleted: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texmfcnf.old
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texmfcnf.old 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texmfcnf.old 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,68 +0,0 @@
---- texk/kpathsea/texmf.in-teTeX.orig 2005-03-21 13:35:04.000000000 +0100
-+++ texk/kpathsea/texmf.in-teTeX 2005-03-21 13:35:04.000000000 +0100
-@@ -59,12 +59,15 @@
- TEXMFMAIN = @texmf@
-
- % The main distribution tree:
--TEXMFDIST = @texmf at -dist
-+% TEXMFDIST = @texmf at -dist
-+% TEXMFDIST is not used in Debian, everything is in $TEXMFMAIN
-+TEXMFDIST = $TEXMFMAIN
-+
-
- % A place for local additions to a "standard" texmf tree.
- % This tree is not used for local configuration maintained by
- % texconfig, it uses TEXMFCONFIG below.
--TEXMFLOCAL = @texmf at -local
-+TEXMFLOCAL = /usr/local/share/texmf
-
- % TEXMFSYSVAR, where texconfig-sys stores variable runtime data.
- % With teTeX-3.0 or later, this must be set.
-@@ -72,7 +75,8 @@
- % TEXMFSYSVAR = $TEXMFMAIN
- % For using a separate tree:
- % TEXMFSYSVAR = @texmf at -var
--TEXMFSYSVAR = @texmf at -var
-+% Debian uses this separate TEXMFSYSVAR tree:
-+TEXMFSYSVAR = /var/lib/texmf
-
- % TEXMFSYSCONFIG, where texconfig-sys stores configuration data.
- % With teTeX-3.0 or later, this must be set.
-@@ -80,7 +84,8 @@
- % TEXMFSYSCONFIG = $TEXMFMAIN
- % For using a separate tree:
- % TEXMFSYSCONFIG = @texmf at -config
--TEXMFSYSCONFIG = @texmf at -config
-+% In Debian, this should be the same as TEXMFMAIN
-+TEXMFSYSCONFIG = $TEXMFMAIN
-
- % User texmf trees can be catered for like this...
- % This used to be HOMETEXMF.
-@@ -111,7 +116,7 @@
- %
- % For texconfig to work properly, TEXMFCONGIG and TEXMFVAR should be named
- % explicitly and before all other trees.
--TEXMF = {!!$TEXMFCONFIG,!!$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
-+TEXMF = {!!$TEXMFCONFIG,!!$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFMAIN}
-
- % The system trees. These are the trees that are shared by all the users.
- SYSTEXMF = $TEXMFLOCAL;$TEXMFMAIN;$TEXMFDIST
-@@ -119,7 +124,7 @@
- % Where generated fonts may be written. This tree is used when the sources
- % were found in a system tree and either that tree wasn't writable, or the
- % varfonts feature was enabled in MT_FEATURES in mktex.cnf.
--VARTEXFONTS = @vartexfonts@
-+VARTEXFONTS = /var/cache/fonts
-
- % Where to look for ls-R files. There need not be an ls-R in the
- % directories in this path, but if there is one, Kpathsea will use it.
---- texk/kpathsea/Makefile.in.orig 2005-03-21 13:35:04.000000000 +0100
-+++ texk/kpathsea/Makefile.in 2005-03-21 13:35:04.000000000 +0100
-@@ -88,6 +88,7 @@
- echo '/^[% ]*TEXMFCONFIG[ =]/s%\$$TEXMF%$(texmf)%' >>$@
- echo '/^[% ]*TEXMFVAR[ =]/s%$(texmf)MAIN%\$$TEXMFMAIN%' >>$@
- echo '/^[% ]*TEXMFCONFIG[ =]/s%$(texmf)MAIN%\$$TEXMFMAIN%' >>$@
-+ echo '/^[% ]*TEXMFDIST[ =]/s%$(texmf)MAIN%\$$TEXMFMAIN%' >>$@
- echo '/^[% ]*TEXMFCNF[ =]/s%\$$TEXMF%$(texmf)%' >>$@
- # And fill in the last clause of TEXMFCNF with an absolute path.
- echo '/^ *TEXMFCNF[ =]/s%@web2c@%$(web2cdir)%' >>$@
Deleted: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-tmp.files
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-tmp.files 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-tmp.files 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,3 +0,0 @@
-texk/tetex/epstopdf
-texk/tetex/epstopdf.man
-
Deleted: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-xdvi-300109.files
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-xdvi-300109.files 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-xdvi-300109.files 2005-10-14 13:54:41 UTC (rev 223)
@@ -1 +0,0 @@
-texk/xdvik/xdvi.c
Deleted: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-xdvi-300109.old
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-xdvi-300109.old 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-xdvi-300109.old 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,18 +0,0 @@
---- texk/xdvik/xdvi.c.orig 25 Jan 2005 19:53:51 -0000 1.453
-+++ texk/xdvik/xdvi.c 17 Mar 2005 23:15:14 -0000
-@@ -3867,8 +3867,13 @@
-
- if (real_filename == NULL)
- return NULL;
--
-- ret = REALPATH(real_filename, canonical_path);
-+
-+ if ((ret = REALPATH(real_filename, canonical_path)) == NULL) {
-+ /* REALPATH failed, use real_filename */
-+ strncpy(canonical_path, real_filename, MAXPATHLEN);
-+ canonical_path[MAXPATHLEN] = '\0';
-+ ret = canonical_path;
-+ }
- free(real_filename);
-
- /* check for correct DVI files */
Deleted: tetex-bin/branches/changelog_for_unstable/debian/patches/patchlist.mk
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patchlist.mk 2005-10-14 13:42:00 UTC (rev 222)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patchlist.mk 2005-10-14 13:54:41 UTC (rev 223)
@@ -1,24 +0,0 @@
-# to be included from dsf-patch
-
-# define variables
-
-# e.g.
-# patchdir = debian/patches
-# patchopts = -p0 -N
-patchopts += -g0
-
-# define patches
-patchnames = patch-deb patch-src patch-texdoc patch-texdoctk \
- patch-texmfcnf patch-tds patch-libtool patch-tmp patch-CAN-2004-0888 \
- patch-CAN-2005-0064 patch-xdvi-300109
-
-build-patches = $(patchnames)
-
-# define dependencies between patches
-# (needed if some patches act on the same file)
-
-patches_with_prereq = patch-tds
-
-patch-tds_prerequisites = patch-texmfcnf
-
-
More information about the Pkg-tetex-commits
mailing list