[Debian-tex-commits] SVN tetex-bin commit + diffs: r2215 - in
tetex-bin/trunk/debian: . patches
Florent Rougon
frn at alioth.debian.org
Tue Jan 2 16:55:07 CET 2007
Author: frn
Date: 2007-01-02 16:55:07 +0100 (Tue, 02 Jan 2007)
New Revision: 2215
Modified:
tetex-bin/trunk/debian/changelog
tetex-bin/trunk/debian/patches/README.patches
tetex-bin/trunk/debian/patches/patch-deb
Log:
[New stuff]
Remove trailing spaces in some of our patches, so that 'quilt refresh' stops
complaining like that:
Warning: trailing whitespace in line 1283 of texk/tetex/texconfig
Warning: trailing whitespace in lines 20,24,49,53,62,78,87,92,115,129,146,161,165,192,196,200,207,215 of texk/tetex/texconfig.man
[Imported from the 'etch' branch]
In patch-deb:
* mktexlsr: print a useful message instead of "no" when called by root
with no arguments (closes: #402763).
* mktexlsr.man: document the change due to the patch closing bug #294197
(cf. first changelog entry for 3.0-27).
and mention the related changes in README.patches.
Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog 2007-01-02 14:55:15 UTC (rev 2214)
+++ tetex-bin/trunk/debian/changelog 2007-01-02 15:55:07 UTC (rev 2215)
@@ -1,12 +1,21 @@
-tetex-bin (3.0-28~1) UNRELEASED; urgency=low
+tetex-bin (3.0-29~1) UNRELEASED; urgency=low
* Do no longer patch dvipdfm to link against libpaper. Instead, enhance
texconfig to handle more paper sizes for dvipdfm, dvips and pdftex.
This will allow to let a libpaper hook set the default paper size with
- texconfig.
+ texconfig.
-- Frank Küster <frank at debian.org> Thu, 14 Dec 2006 21:01:07 +0100
+tetex-bin (3.0-28) unstable; urgency=low
+
+ * mktexlsr: print a useful message instead of "no" when called by root
+ with no arguments (closes: #402763).
+ * mktexlsr.man: document the change due to the patch closing bug #294197
+ (cf. first changelog entry for 3.0-27).
+
+ -- Florent Rougon <frn at debian.org> Wed, 27 Dec 2006 23:22:03 +0100
+
tetex-bin (3.0-27) unstable; urgency=low
* Apply patch by Julian Gilbey <jdg at debian.org> to prevent mktexlsr from
Modified: tetex-bin/trunk/debian/patches/README.patches
===================================================================
--- tetex-bin/trunk/debian/patches/README.patches 2007-01-02 14:55:15 UTC (rev 2214)
+++ tetex-bin/trunk/debian/patches/README.patches 2007-01-02 15:55:07 UTC (rev 2215)
@@ -41,7 +41,16 @@
- Do not require directory write access if the ls-R file
exists and is writeable
- tempfile and mktemp are only available in Debian
+ - don't create nor update ls-R in directories under $HOME/
+ (presumably, TEXMFHOME) when called by root, unless the directories
+ were explicitely given on the command line (closes: #294197).
+texk/kpathsea/mktexlsr.man:
+ - document that ls-R files for TEXMF trees under $HOME/ won't be
+ created nor updated by mktexlsr when called by root, unless the
+ directories are explicitely given on the command line (cf. bug
+ #294197).
+
texk/make/paths.mk:
Shouldn't this be changed to /var/cache/fonts? Is this
change necessary at all?
Modified: tetex-bin/trunk/debian/patches/patch-deb
===================================================================
--- tetex-bin/trunk/debian/patches/patch-deb 2007-01-02 14:55:15 UTC (rev 2214)
+++ tetex-bin/trunk/debian/patches/patch-deb 2007-01-02 15:55:07 UTC (rev 2215)
@@ -18,8 +18,8 @@
Index: trunk/configure
===================================================================
---- trunk.orig/configure 2006-12-07 17:39:17.000000000 +0100
-+++ trunk/configure 2006-12-14 19:26:40.000000000 +0100
+--- trunk.orig/configure 2007-01-02 16:33:42.000000000 +0100
++++ trunk/configure 2007-01-02 16:37:46.000000000 +0100
@@ -4213,12 +4213,13 @@
@@ -42,25 +42,30 @@
if test -z "$xdvik_standalone"; then
Index: trunk/texk/kpathsea/mktexlsr
===================================================================
---- trunk.orig/texk/kpathsea/mktexlsr 2006-12-07 17:39:17.000000000 +0100
-+++ trunk/texk/kpathsea/mktexlsr 2006-12-14 19:26:40.000000000 +0100
-@@ -73,6 +73,7 @@
+--- trunk.orig/texk/kpathsea/mktexlsr 2007-01-02 16:33:42.000000000 +0100
++++ trunk/texk/kpathsea/mktexlsr 2007-01-02 16:37:46.000000000 +0100
+@@ -73,6 +73,9 @@
'
set x `kpsewhich --show-path=ls-R | tr : '
' | sort | uniq`; shift
-+ if test "`id -u`" -eq 0; then NOROOTHOME=true; echo "no"; fi;
++ if test "`id -u`" -eq 0; then
++ NOROOTHOME=true
++ fi
IFS=$OIFS
}
-@@ -80,6 +81,7 @@
+@@ -80,6 +83,10 @@
# Prepend cwd if the directory was relative.
case "$TEXMFLS_R" in
"") continue ;; # Strictly speaking, it is an error if this case is taken.
-+ $HOME/*) if test -n "$NOROOTHOME"; then continue; fi ;;
++ $HOME/*) if test -n "$NOROOTHOME"; then
++ tty -s && echo "$progname: Skipping $TEXMFLS_R" >&2
++ continue
++ fi ;;
/* | [A-z]:/*) ;;
*) TEXMFLS_R="`pwd`/$TEXMFLS_R"
esac
-@@ -103,9 +105,9 @@
+@@ -103,9 +110,9 @@
db_dir=`echo "$db_file" | sed 's%/[^/][^/]*$%%'` # can't rely on dirname
test -d "$db_dir" || continue
@@ -71,7 +76,7 @@
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 +121,8 @@
+@@ -119,11 +126,8 @@
# Skip if we cannot write the file:
kpseaccess -w "$db_file" || { echo "$progname: $db_file: no write permission. Skipping..." >&2; continue; }
@@ -85,7 +90,7 @@
tty -s && echo "$progname: Updating $db_file... " >&2
echo "$ls_R_magic" >"$db_file_tmp"
-@@ -137,12 +136,8 @@
+@@ -137,12 +141,8 @@
(cd "$TEXMFLS_R" && \ls -LRa 2>/dev/null) |
sed '/^$/{n;s%^\./%%;s%^%./%;}; /^\.$/d; /^\.\.$/d; /^[\.\/]*lsR[0-9]*\.tmp:*$/d' >>"$db_file_tmp"
@@ -102,8 +107,8 @@
exit 0
Index: trunk/texk/make/paths.mk
===================================================================
---- trunk.orig/texk/make/paths.mk 2006-12-07 17:39:17.000000000 +0100
-+++ trunk/texk/make/paths.mk 2006-12-14 19:26:40.000000000 +0100
+--- trunk.orig/texk/make/paths.mk 2007-01-02 16:33:42.000000000 +0100
++++ trunk/texk/make/paths.mk 2007-01-02 16:37:46.000000000 +0100
@@ -47,7 +47,7 @@
texmf = @texmfmain@
@@ -115,8 +120,8 @@
texinputdir = $(texmf)/tex
Index: trunk/texk/tetex/Makefile.in
===================================================================
---- trunk.orig/texk/tetex/Makefile.in 2006-12-07 17:39:17.000000000 +0100
-+++ trunk/texk/tetex/Makefile.in 2006-12-14 19:26:40.000000000 +0100
+--- trunk.orig/texk/tetex/Makefile.in 2007-01-02 16:33:42.000000000 +0100
++++ trunk/texk/tetex/Makefile.in 2007-01-02 16:37:46.000000000 +0100
@@ -35,7 +35,7 @@
# Auxiliary files.
@@ -147,8 +152,8 @@
$(INSTALL_DATA) $(srcdir)/texmf/texconfig/g/generic $(texmf)/texconfig/g
Index: trunk/texk/tetex/texconfig
===================================================================
---- trunk.orig/texk/tetex/texconfig 2006-12-07 17:39:17.000000000 +0100
-+++ trunk/texk/tetex/texconfig 2006-12-14 19:47:16.000000000 +0100
+--- trunk.orig/texk/tetex/texconfig 2007-01-02 16:33:42.000000000 +0100
++++ trunk/texk/tetex/texconfig 2007-01-02 16:37:46.000000000 +0100
@@ -646,18 +646,20 @@
# texconfig dvipdfm
@@ -285,7 +290,7 @@
echo "$progname: try \`$progname pdftex paper' for help" >&2
rc=1 ;;
- esac ;;
-+ esac
++ esac
+ if [ $rc != 1 ]; then
+ setupTmpDir
+ fmgrConfigReplace pdftexconfig.tex pdfpagewidth '\pdfpagewidth='"$w"
@@ -301,8 +306,8 @@
*)
Index: trunk/texk/tetex/fmtutil
===================================================================
---- trunk.orig/texk/tetex/fmtutil 2006-12-07 17:39:17.000000000 +0100
-+++ trunk/texk/tetex/fmtutil 2006-12-14 19:26:40.000000000 +0100
+--- trunk.orig/texk/tetex/fmtutil 2007-01-02 16:33:42.000000000 +0100
++++ trunk/texk/tetex/fmtutil 2007-01-02 16:37:46.000000000 +0100
@@ -25,7 +25,13 @@
# --cnffile file set configfile for fmtutil
# --fmtdir directory set destination directory for format files
@@ -394,8 +399,8 @@
Index: trunk/texk/tetex/fmtutil-sys
===================================================================
---- trunk.orig/texk/tetex/fmtutil-sys 2006-12-07 17:39:17.000000000 +0100
-+++ trunk/texk/tetex/fmtutil-sys 2006-12-14 19:26:40.000000000 +0100
+--- trunk.orig/texk/tetex/fmtutil-sys 2007-01-02 16:33:42.000000000 +0100
++++ trunk/texk/tetex/fmtutil-sys 2007-01-02 16:37:46.000000000 +0100
@@ -23,6 +23,12 @@
TEXMFVAR="$v"
@@ -413,8 +418,8 @@
+esac
Index: trunk/texk/tetex/fmtutil.man
===================================================================
---- trunk.orig/texk/tetex/fmtutil.man 2006-12-07 17:39:17.000000000 +0100
-+++ trunk/texk/tetex/fmtutil.man 2006-12-14 19:26:40.000000000 +0100
+--- trunk.orig/texk/tetex/fmtutil.man 2007-01-02 16:33:42.000000000 +0100
++++ trunk/texk/tetex/fmtutil.man 2007-01-02 16:37:46.000000000 +0100
@@ -1,4 +1,4 @@
-.TH "fmtutil" "8" "February 2005" "teTeX" "teTeX"
+.TH "fmtutil" "1" "February 2005" "teTeX" "teTeX"
@@ -454,8 +459,8 @@
.PP
Index: trunk/texk/web2c/fmtutil.in
===================================================================
---- trunk.orig/texk/web2c/fmtutil.in 2006-12-07 17:39:17.000000000 +0100
-+++ trunk/texk/web2c/fmtutil.in 2006-12-14 19:26:40.000000000 +0100
+--- trunk.orig/texk/web2c/fmtutil.in 2007-01-02 16:33:42.000000000 +0100
++++ trunk/texk/web2c/fmtutil.in 2007-01-02 16:37:46.000000000 +0100
@@ -55,7 +55,7 @@
# Change "amstex.ini -> bamstex.ini" and "- -> language.dat"
@@ -467,8 +472,8 @@
# if you want babel support in pdfamstex:
Index: trunk/texk/web2c/cwebdir/cweb.1
===================================================================
---- trunk.orig/texk/web2c/cwebdir/cweb.1 2006-12-07 17:39:17.000000000 +0100
-+++ trunk/texk/web2c/cwebdir/cweb.1 2006-12-14 19:26:40.000000000 +0100
+--- trunk.orig/texk/web2c/cwebdir/cweb.1 2007-01-02 16:33:42.000000000 +0100
++++ trunk/texk/web2c/cwebdir/cweb.1 2007-01-02 16:37:46.000000000 +0100
@@ -100,19 +100,19 @@
.
.SH FILES
@@ -496,8 +501,8 @@
.SH "SEE ALSO"
Index: trunk/texk/tetex/updmap.man
===================================================================
---- trunk.orig/texk/tetex/updmap.man 2006-12-07 17:39:17.000000000 +0100
-+++ trunk/texk/tetex/updmap.man 2006-12-14 19:26:40.000000000 +0100
+--- trunk.orig/texk/tetex/updmap.man 2007-01-02 16:33:42.000000000 +0100
++++ trunk/texk/tetex/updmap.man 2007-01-02 16:37:46.000000000 +0100
@@ -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
@@ -573,8 +578,8 @@
.PP
Index: trunk/texk/tetex/updmap
===================================================================
---- trunk.orig/texk/tetex/updmap 2006-12-14 19:26:40.000000000 +0100
-+++ trunk/texk/tetex/updmap 2006-12-14 19:26:40.000000000 +0100
+--- trunk.orig/texk/tetex/updmap 2007-01-02 16:37:46.000000000 +0100
++++ trunk/texk/tetex/updmap 2007-01-02 16:37:46.000000000 +0100
@@ -15,6 +15,8 @@
# --nohash do not run texhash
# --nomkmap do not recreate map files
@@ -730,8 +735,8 @@
enable)
Index: trunk/texk/tetex/updmap-sys
===================================================================
---- trunk.orig/texk/tetex/updmap-sys 2006-12-07 17:39:17.000000000 +0100
-+++ trunk/texk/tetex/updmap-sys 2006-12-14 19:26:40.000000000 +0100
+--- trunk.orig/texk/tetex/updmap-sys 2007-01-02 16:33:42.000000000 +0100
++++ trunk/texk/tetex/updmap-sys 2007-01-02 16:37:46.000000000 +0100
@@ -23,6 +23,7 @@
TEXMFVAR="$v"
@@ -743,8 +748,8 @@
exec updmap ${1+"$@"}
Index: trunk/texk/tetex/texconfig-sys
===================================================================
---- trunk.orig/texk/tetex/texconfig-sys 2006-12-07 17:39:17.000000000 +0100
-+++ trunk/texk/tetex/texconfig-sys 2006-12-14 19:26:40.000000000 +0100
+--- trunk.orig/texk/tetex/texconfig-sys 2007-01-02 16:33:42.000000000 +0100
++++ trunk/texk/tetex/texconfig-sys 2007-01-02 16:37:46.000000000 +0100
@@ -23,6 +23,7 @@
TEXMFVAR="$v"
@@ -756,8 +761,8 @@
exec texconfig ${1+"$@"}
Index: trunk/texk/web2c/man/Makefile.in
===================================================================
---- trunk.orig/texk/web2c/man/Makefile.in 2006-12-07 17:39:17.000000000 +0100
-+++ trunk/texk/web2c/man/Makefile.in 2006-12-14 19:26:40.000000000 +0100
+--- trunk.orig/texk/web2c/man/Makefile.in 2007-01-02 16:33:42.000000000 +0100
++++ trunk/texk/web2c/man/Makefile.in 2007-01-02 16:37:46.000000000 +0100
@@ -38,7 +38,6 @@
dvicopy.1 \
dvitomp.1 \
@@ -768,8 +773,8 @@
gftopk.1 \
Index: trunk/texk/tetex/texconfig.man
===================================================================
---- trunk.orig/texk/tetex/texconfig.man 2006-12-07 17:39:17.000000000 +0100
-+++ trunk/texk/tetex/texconfig.man 2006-12-14 19:26:40.000000000 +0100
+--- trunk.orig/texk/tetex/texconfig.man 2007-01-02 16:33:42.000000000 +0100
++++ trunk/texk/tetex/texconfig.man 2007-01-02 16:37:46.000000000 +0100
@@ -6,22 +6,230 @@
.SH SYNOPSIS
.B texconfig
@@ -786,11 +791,11 @@
+in an easy and convenient manner, offering a series of dialog boxes to
+the user. After choosing settings or options, the appropriate files
+are changed automatically and the new settings are applied for the
-+user. If needed, copies of files in
++user. If needed, copies of files in
+.I TEXMFDIST
+or
+.I TEXMFMAIN
-+will be made in the user's
++will be made in the user's
+.I TEXMFCONFIG
+tree.
+.PP
@@ -820,11 +825,11 @@
+.B fmtutil.cnf(5), updmap.cfg(5), texmf.cnf
+and
+.B language.dat
-+are generated files in Debian. See
++are generated files in Debian. See
+.I TeX-on-Debian.pdf, TeX-on-Debian.txt.gz
+or
+.I TeX-on-Debian.hmlt/index.html
-+in
++in
+.I /usr/share/doc/tex-common/
+for alternatives.
+.PP
@@ -833,7 +838,7 @@
+the following commands
+.SH COMMANDS
+Commands that accept further options usually display available options
-+if called without them. For example,
++if called without them. For example,
+.B texconfig dvipdfm paper
+will inform about valid paper settings.
+.PP
@@ -849,7 +854,7 @@
+.B dvips add PRINTERNAME
+Create a new (empty) configuration file
+.I TEXMFCONFIG/dvips/config/config.PRINTERNAME.
-+This file can later be filled with the
++This file can later be filled with the
+.B mode, offset
+or
+.B printcmd
@@ -858,12 +863,12 @@
+.B dvips del PRINTERNAME
+Remove
+.I config.PRINTERNAME
-+.TP
++.TP
+.B dvips mode
+List available MetaFont modes.
+.TP
+.B dvips [-P PRINTER] mode MODE
-+Change the MetaFont mode to
++Change the MetaFont mode to
+.I MODE
+for
+.I PRINTER
@@ -886,7 +891,7 @@
+numbers.
+.TP
+.B dvips [-P PRINTER] printcmd CMD
-+Set the printing command for
++Set the printing command for
+.I PRINTER
+or for all output files
+.I (config.ps),
@@ -900,7 +905,7 @@
+.I o
+option in
+.B info dvips
-+or the
++or the
+.I -O
+option in
+.B dvips(1).
@@ -917,7 +922,7 @@
+and read section 2.5, font caching, in the TeX-on-Debian documentation
+in
+.I /usr/share/doc/tex-common/.
-+.TP
++.TP
+.B formats
+This command allows to edit
+.B fmtutil.cnf(5)
@@ -932,11 +937,11 @@
+.B hyphen FORMAT
+This command allows to edit the hyphenation configuration file for
+formats that support this, and recreates the formats afterwards to
-+enable the new languages. Available formats are shown when no
++enable the new languages. Available formats are shown when no
+.I FORMAT
+is given.
+.IP
-+Note that for formats that use LaTeX's
++Note that for formats that use LaTeX's
+.I language.dat,
+ e.g.
+.I (pdf)jadetex
@@ -963,22 +968,22 @@
+developed for, and their DPI resolution
+.TP
+.B mode MODE
-+Set the default printer mode in
++Set the default printer mode in
+.I /etc/texmf/web2c/mktex.cnf
+or the respective user file in
+.I $TEXMFCONFIG/web2c
-+to
++to
+.B MODE.
+.TP
+.B paper [a4|letter]
-+Set the default papersize for
++Set the default papersize for
+.B dvips, dvipdfm, pdftex
+and
+.B xdvi.
+The set is restricted because not all programs understand all sizes.
+.TP
+.B pdftex paper [a4|letter]
-+Set the default paper size for
++Set the default paper size for
+.B pdftex.
+.TP
+.B rehash
@@ -986,7 +991,7 @@
+.B mktexlsr.
+.TP
+.B xdvi paper PAPER
-+Set the default paper size for
++Set the default paper size for
+.B xdvi.
+The (long) list is available with
+.B texconfig xdvi paper.
@@ -1009,3 +1014,26 @@
+environment variable.
.SH AUTHOR
Thomas Esser <te at dbs.uni-hannover.de>
+Index: trunk/texk/kpathsea/mktexlsr.man
+===================================================================
+--- trunk.orig/texk/kpathsea/mktexlsr.man 2007-01-02 16:38:16.000000000 +0100
++++ trunk/texk/kpathsea/mktexlsr.man 2007-01-02 16:37:18.000000000 +0100
+@@ -1,4 +1,4 @@
+-.TH MKTEXLSR 1 "4 January 1998" "Kpathsea @VERSION@"
++.TH MKTEXLSR 1 "27 December 2006" "Kpathsea @VERSION@"
+ .\"=====================================================================
+ .if n .ds MP MetaPost
+ .if t .ds MP MetaPost
+@@ -44,3 +44,12 @@
+ .B --version
+ .rb
+ Print version information and exit.
++.\"=====================================================================
++.SH NOTES
++When called by root with no arguments, \fBmktexlsr\fP in Debian ignores
++TEXMF trees under \fI$HOME\fP. This is to avoid creating undesirable files
++such as \fI/root/texmf/ls-R\fP when doing usual maintainance (it is generally
++a bad idea to work with TeX as root, therefore having a file such as
++\fI/root/texmf/ls-R\fP in the first place is rather pointless). If you really
++want to update the ls-R databases for such TEXMF trees, simply list them
++explicitely on the command-line.
More information about the Debian-tex-commits
mailing list