[subversion-commit] SVN tetex commit + diffs: r260 -
tetex-bin/trunk/debian/patches
Ralf Stubner
stubner-guest at costa.debian.org
Tue Oct 18 09:06:27 UTC 2005
Author: stubner-guest
Date: 2005-10-18 09:06:26 +0000 (Tue, 18 Oct 2005)
New Revision: 260
Modified:
tetex-bin/trunk/debian/patches/patch-deb
Log:
* fmtutil and updmap issue a second warning at the end when run as root
* change fmtuitl->updmap in updmap's warning
Modified: tetex-bin/trunk/debian/patches/patch-deb
===================================================================
--- tetex-bin/trunk/debian/patches/patch-deb 2005-10-17 13:20:47 UTC (rev 259)
+++ tetex-bin/trunk/debian/patches/patch-deb 2005-10-18 09:06:26 UTC (rev 260)
@@ -13,10 +13,10 @@
texk/web2c/fmtutil.in | 2 +-
13 files changed, 144 insertions(+), 43 deletions(-)
-Index: tetex-bin-3.0/configure
+Index: tetex-bin/configure
===================================================================
---- tetex-bin-3.0.orig/configure 2005-10-06 15:04:48.000000000 +0200
-+++ tetex-bin-3.0/configure 2005-10-17 14:10:33.707515137 +0200
+--- tetex-bin.orig/configure 2005-10-17 22:36:19.731602000 +0200
++++ tetex-bin/configure 2005-10-17 22:57:31.342874000 +0200
@@ -4213,12 +4213,13 @@
@@ -37,10 +37,10 @@
# more customizations for standalone xdvik
if test -z "$xdvik_standalone"; then
-Index: tetex-bin-3.0/texk/kpathsea/mktexlsr
+Index: tetex-bin/texk/kpathsea/mktexlsr
===================================================================
---- tetex-bin-3.0.orig/texk/kpathsea/mktexlsr 2005-10-06 15:04:48.000000000 +0200
-+++ tetex-bin-3.0/texk/kpathsea/mktexlsr 2005-10-17 14:10:33.735512074 +0200
+--- tetex-bin.orig/texk/kpathsea/mktexlsr 2005-10-17 22:36:19.731602000 +0200
++++ tetex-bin/texk/kpathsea/mktexlsr 2005-10-17 22:57:31.352874000 +0200
@@ -103,9 +103,9 @@
db_dir=`echo "$db_file" | sed 's%/[^/][^/]*$%%'` # can't rely on dirname
@@ -81,10 +81,10 @@
done
tty -s && echo "$progname: Done." >&2
exit 0
-Index: tetex-bin-3.0/texk/make/paths.mk
+Index: tetex-bin/texk/make/paths.mk
===================================================================
---- tetex-bin-3.0.orig/texk/make/paths.mk 2005-10-06 15:04:48.000000000 +0200
-+++ tetex-bin-3.0/texk/make/paths.mk 2005-10-17 14:10:33.766508683 +0200
+--- tetex-bin.orig/texk/make/paths.mk 2005-10-17 22:36:19.731602000 +0200
++++ tetex-bin/texk/make/paths.mk 2005-10-17 22:57:31.352874000 +0200
@@ -47,7 +47,7 @@
texmf = @texmfmain@
@@ -94,10 +94,10 @@
# Regular input files.
texinputdir = $(texmf)/tex
-Index: tetex-bin-3.0/texk/tetex/Makefile.in
+Index: tetex-bin/texk/tetex/Makefile.in
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/Makefile.in 2005-10-06 15:04:48.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/Makefile.in 2005-10-17 14:10:33.787506386 +0200
+--- tetex-bin.orig/texk/tetex/Makefile.in 2005-10-17 22:36:19.731602000 +0200
++++ tetex-bin/texk/tetex/Makefile.in 2005-10-17 22:57:31.352874000 +0200
@@ -35,7 +35,7 @@
# Auxiliary files.
@@ -116,10 +116,10 @@
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
-Index: tetex-bin-3.0/texk/tetex/texconfig
+Index: tetex-bin/texk/tetex/texconfig
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/texconfig 2005-10-06 15:04:48.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/texconfig 2005-10-17 14:10:33.794505620 +0200
+--- tetex-bin.orig/texk/tetex/texconfig 2005-10-17 22:36:19.731602000 +0200
++++ tetex-bin/texk/tetex/texconfig 2005-10-17 22:57:31.352874000 +0200
@@ -883,8 +883,8 @@
faq)
@@ -139,10 +139,10 @@
else
echo "$progname: setting up vardir failed. Reason: no permission to write file \`$tfc'" >&2
rc=1
-Index: tetex-bin-3.0/texk/tetex/fmtutil
+Index: tetex-bin/texk/tetex/fmtutil
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/fmtutil 2005-10-06 15:04:48.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/fmtutil 2005-10-17 14:10:58.095847079 +0200
+--- tetex-bin.orig/texk/tetex/fmtutil 2005-10-17 22:36:19.731602000 +0200
++++ tetex-bin/texk/tetex/fmtutil 2005-10-17 22:57:48.392874000 +0200
@@ -25,7 +25,13 @@
# --cnffile file set configfile for fmtutil
# --fmtdir directory set destination directory for format files
@@ -167,7 +167,7 @@
argv0=$0
version=1105809354 # seconds since `00:00:00 1970-01-01 UTC'
# date '+%s' (with GNU date)
-@@ -84,6 +90,29 @@
+@@ -84,6 +90,30 @@
cnf=fmtutil.cnf # name of the config file
###############################################################################
@@ -188,6 +188,7 @@
+ 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
++ export SHOW_UID_WARNING=true
+ exec fmtutil-sys ${1+"$@"}
+ fi
+ fi
@@ -197,10 +198,29 @@
# cleanup()
# clean up the temp area and exit with proper exit status
###############################################################################
-Index: tetex-bin-3.0/texk/tetex/fmtutil-sys
+@@ -885,5 +915,18 @@
+ }
+
+ main ${1+"$@"}
++
++###############################################################################
++# Debian hack, needed until depending packages have switched to
++# calling fmtutil-sys
++###############################################################################
++if [ $SHOW_UID_WARNING ]; then
++ echo
++ echo "Warning: fmtutil was run as root; fmtutil-sys was used instead."
++ echo "If this was done by a Debian package upon installation,"
++ echo "upgrade, or removal, please file a bug against that package."
++ echo
++fi
++
+ true
+ cleanup
+Index: tetex-bin/texk/tetex/fmtutil-sys
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/fmtutil-sys 2005-10-06 15:04:48.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/fmtutil-sys 2005-10-17 14:10:33.804504526 +0200
+--- tetex-bin.orig/texk/tetex/fmtutil-sys 2005-10-17 22:36:19.731602000 +0200
++++ tetex-bin/texk/tetex/fmtutil-sys 2005-10-17 22:57:31.362874000 +0200
@@ -23,6 +23,7 @@
TEXMFVAR="$v"
@@ -210,10 +230,10 @@
+export TEXMFVAR TEXMFCONFIG progname
exec fmtutil ${1+"$@"}
-Index: tetex-bin-3.0/texk/tetex/fmtutil.man
+Index: tetex-bin/texk/tetex/fmtutil.man
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/fmtutil.man 2005-10-06 15:04:48.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/fmtutil.man 2005-10-17 14:10:33.805504417 +0200
+--- tetex-bin.orig/texk/tetex/fmtutil.man 2005-10-17 22:36:19.731602000 +0200
++++ tetex-bin/texk/tetex/fmtutil.man 2005-10-17 22:57:31.362874000 +0200
@@ -41,6 +41,14 @@
.IP "\fB--cnffile\fP \fIfile\fP"
specify the configuration
@@ -245,10 +265,10 @@
.PP
.SH "FILES"
.PP
-Index: tetex-bin-3.0/texk/web2c/fmtutil.in
+Index: tetex-bin/texk/web2c/fmtutil.in
===================================================================
---- tetex-bin-3.0.orig/texk/web2c/fmtutil.in 2005-10-06 15:04:48.000000000 +0200
-+++ tetex-bin-3.0/texk/web2c/fmtutil.in 2005-10-17 14:10:33.829501792 +0200
+--- tetex-bin.orig/texk/web2c/fmtutil.in 2005-10-17 22:36:19.741602000 +0200
++++ tetex-bin/texk/web2c/fmtutil.in 2005-10-17 22:57:31.362874000 +0200
@@ -55,7 +55,7 @@
# Change "amstex.ini -> bamstex.ini" and "- -> language.dat"
@@ -258,10 +278,10 @@
# Change "pdfamstex.ini -> pdfbamstex.ini" and "- -> language.dat"
# if you want babel support in pdfamstex:
-Index: tetex-bin-3.0/texk/web2c/cwebdir/cweb.1
+Index: tetex-bin/texk/web2c/cwebdir/cweb.1
===================================================================
---- tetex-bin-3.0.orig/texk/web2c/cwebdir/cweb.1 2005-10-06 15:04:48.000000000 +0200
-+++ tetex-bin-3.0/texk/web2c/cwebdir/cweb.1 2005-10-17 14:10:33.851499385 +0200
+--- tetex-bin.orig/texk/web2c/cwebdir/cweb.1 2005-10-17 22:36:19.741602000 +0200
++++ tetex-bin/texk/web2c/cwebdir/cweb.1 2005-10-17 22:57:31.362874000 +0200
@@ -100,19 +100,19 @@
.
.SH FILES
@@ -287,10 +307,10 @@
Directory for cweb "include" files.
.
.SH "SEE ALSO"
-Index: tetex-bin-3.0/texk/tetex/updmap.man
+Index: tetex-bin/texk/tetex/updmap.man
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/updmap.man 2005-10-06 15:04:48.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/updmap.man 2005-10-17 14:10:33.866497744 +0200
+--- tetex-bin.orig/texk/tetex/updmap.man 2005-10-17 22:36:19.731602000 +0200
++++ tetex-bin/texk/tetex/updmap.man 2005-10-17 22:57:31.362874000 +0200
@@ -32,11 +32,18 @@
line, \fBupdmap\fP will write generated map files to a directory of
your choosing (via one of the \fB--*outputdir\fP options), or automatically
@@ -362,10 +382,10 @@
\fBgsftopk\fP(1), \fBpdftex\fP(1), \fBps2pk\fP(1),
\fBtexhash\fP(1), \fBxdvi\fP(1)\&.
.PP
-Index: tetex-bin-3.0/texk/tetex/updmap
+Index: tetex-bin/texk/tetex/updmap
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/updmap 2005-10-17 14:10:33.171573768 +0200
-+++ tetex-bin-3.0/texk/tetex/updmap 2005-10-17 14:10:33.869497416 +0200
+--- tetex-bin.orig/texk/tetex/updmap 2005-10-17 22:57:31.192874000 +0200
++++ tetex-bin/texk/tetex/updmap 2005-10-17 22:57:31.372874000 +0200
@@ -15,6 +15,8 @@
# --nohash do not run texhash
# --nomkmap do not recreate map files
@@ -375,7 +395,7 @@
#
# Valid commands:
# --edit edit $cnfFileShort file
-@@ -112,10 +114,37 @@
+@@ -112,10 +114,38 @@
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
# the version string
@@ -399,10 +419,11 @@
+ else
+ if [ ! "$progname" = "updmap-sys" ]; then
+ echo
-+ echo "Warning: fmtutil is being run as root; fmtutil-sys should probably be"
++ echo "Warning: updmap is being run as root; updmap-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
++ export SHOW_UID_WARNING=true
+ exec updmap-sys ${1+"$@"}
+ fi
+ fi
@@ -414,7 +435,7 @@
# help()
# display help message and exit
###############################################################################
-@@ -317,6 +346,8 @@
+@@ -317,6 +347,8 @@
# sets option to value in the config file (replacing the existing setting
# or by adding a new line to the config file).
###############################################################################
@@ -423,7 +444,7 @@
setOption()
{
opt=$1
-@@ -351,6 +382,8 @@
+@@ -351,6 +383,8 @@
# enableMap (type, map)
# enables an entry in the config file for map with a given type.
###############################################################################
@@ -432,7 +453,7 @@
enableMap()
{
case $1 in
-@@ -373,6 +406,8 @@
+@@ -373,6 +407,8 @@
# disableMap (map)
# disables map in config file (any type)
###############################################################################
@@ -441,7 +462,7 @@
disableMap()
{
#mapType=`awk '($1 == "MixedMap" || $1 == "Map") && $2 == map { print $1 }' \
-@@ -385,6 +420,11 @@
+@@ -385,6 +421,11 @@
}
###############################################################################
@@ -453,7 +474,7 @@
# psADOBE()
# transform fontnames from URW to Adobe
###############################################################################
-@@ -1274,7 +1314,8 @@
+@@ -1274,7 +1315,8 @@
main()
{
# initialize global variables
@@ -463,10 +484,28 @@
cmd=
log=
-Index: tetex-bin-3.0/texk/tetex/updmap-sys
+@@ -1375,4 +1417,17 @@
+ }
+
+ main ${1+"$@"}
++
++###############################################################################
++# Debian hack, needed until depending packages have switched to
++# calling updmap-sys
++###############################################################################
++if [ $SHOW_UID_WARNING ]; then
++ echo
++ echo "Warning: updmap was run as root; updmap-sys was used instead."
++ echo "If this was done by a Debian package upon installation,"
++ echo "upgrade, or removal, please file a bug against that package."
++ echo
++fi
++
+ cleanup
+Index: tetex-bin/texk/tetex/updmap-sys
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/updmap-sys 2005-10-06 15:04:48.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/updmap-sys 2005-10-17 14:10:33.883495885 +0200
+--- tetex-bin.orig/texk/tetex/updmap-sys 2005-10-17 22:36:19.741602000 +0200
++++ tetex-bin/texk/tetex/updmap-sys 2005-10-17 22:57:31.372874000 +0200
@@ -23,6 +23,7 @@
TEXMFVAR="$v"
More information about the Pkg-tetex-commits
mailing list