[subversion-commit] SVN tetex commit + diffs: r413 - in
tetex-bin/trunk/debian: . patches
Julian Gilbey
jdg at costa.debian.org
Thu Dec 15 18:12:51 UTC 2005
Author: jdg
Date: 2005-12-15 18:12:50 +0000 (Thu, 15 Dec 2005)
New Revision: 413
Modified:
tetex-bin/trunk/debian/changelog
tetex-bin/trunk/debian/patches/patch-deb
tetex-bin/trunk/debian/patches/patch-poppler
tetex-bin/trunk/debian/patches/series
Log:
warnings when fmtutil is called from texconfig-sys (Closes: #343172) [jdg]
* fmtutil: change $scriptname back to $progname to simplify patch [jdg]
* fmtutil, updmap: fix mktexfmt handling (now called correctly by root
and non-root) and error message handling when fmtutil/updmap called by
root [jdg]
Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog 2005-12-15 13:00:38 UTC (rev 412)
+++ tetex-bin/trunk/debian/changelog 2005-12-15 18:12:50 UTC (rev 413)
@@ -1,10 +1,13 @@
tetex-bin (3.0-13) UNRELEASED; urgency=low
* {texconfig,fmtutil,updmap}-sys: improve handling to avoid spurious
- warnings when fmtutil is called from texconfig-sys (Closes: #343172)
- * fmtutil: change $scriptname back to $progname to simplify patch
+ warnings when fmtutil is called from texconfig-sys (Closes: #343172) [jdg]
+ * fmtutil: change $scriptname back to $progname to simplify patch [jdg]
+ * fmtutil, updmap: fix mktexfmt handling (now called correctly by root
+ and non-root) and error message handling when fmtutil/updmap called by
+ root [jdg]
- -- Julian Gilbey <jdg at debian.org> Tue, 13 Dec 2005 21:37:58 +0000
+ -- Julian Gilbey <jdg at debian.org> Thu, 15 Dec 2005 18:05:06 +0000
tetex-bin (3.0-12) unstable; urgency=low
Modified: tetex-bin/trunk/debian/patches/patch-deb
===================================================================
--- tetex-bin/trunk/debian/patches/patch-deb 2005-12-15 13:00:38 UTC (rev 412)
+++ tetex-bin/trunk/debian/patches/patch-deb 2005-12-15 18:12:50 UTC (rev 413)
@@ -16,8 +16,8 @@
Index: tetex-bin/configure
===================================================================
---- tetex-bin.orig/configure 2005-12-13 21:32:02.000000000 +0000
-+++ tetex-bin/configure 2005-12-13 21:32:18.000000000 +0000
+--- tetex-bin.orig/configure 2005-12-15 17:16:59.000000000 +0000
++++ tetex-bin/configure 2005-12-15 17:55:11.000000000 +0000
@@ -4213,12 +4213,13 @@
@@ -40,8 +40,8 @@
if test -z "$xdvik_standalone"; then
Index: tetex-bin/texk/kpathsea/mktexlsr
===================================================================
---- tetex-bin.orig/texk/kpathsea/mktexlsr 2005-12-13 21:32:02.000000000 +0000
-+++ tetex-bin/texk/kpathsea/mktexlsr 2005-12-13 21:32:18.000000000 +0000
+--- tetex-bin.orig/texk/kpathsea/mktexlsr 2005-12-15 17:16:59.000000000 +0000
++++ tetex-bin/texk/kpathsea/mktexlsr 2005-12-15 17:55:11.000000000 +0000
@@ -103,9 +103,9 @@
db_dir=`echo "$db_file" | sed 's%/[^/][^/]*$%%'` # can't rely on dirname
@@ -84,8 +84,8 @@
exit 0
Index: tetex-bin/texk/make/paths.mk
===================================================================
---- tetex-bin.orig/texk/make/paths.mk 2005-12-13 21:32:02.000000000 +0000
-+++ tetex-bin/texk/make/paths.mk 2005-12-13 21:32:18.000000000 +0000
+--- tetex-bin.orig/texk/make/paths.mk 2005-12-15 17:16:59.000000000 +0000
++++ tetex-bin/texk/make/paths.mk 2005-12-15 17:55:11.000000000 +0000
@@ -47,7 +47,7 @@
texmf = @texmfmain@
@@ -97,8 +97,8 @@
texinputdir = $(texmf)/tex
Index: tetex-bin/texk/tetex/Makefile.in
===================================================================
---- tetex-bin.orig/texk/tetex/Makefile.in 2005-12-13 21:32:02.000000000 +0000
-+++ tetex-bin/texk/tetex/Makefile.in 2005-12-13 21:32:18.000000000 +0000
+--- tetex-bin.orig/texk/tetex/Makefile.in 2005-12-15 17:16:59.000000000 +0000
++++ tetex-bin/texk/tetex/Makefile.in 2005-12-15 17:55:11.000000000 +0000
@@ -35,7 +35,7 @@
# Auxiliary files.
@@ -119,8 +119,8 @@
$(INSTALL_DATA) $(srcdir)/texmf/texconfig/g/generic $(texmf)/texconfig/g
Index: tetex-bin/texk/tetex/texconfig
===================================================================
---- tetex-bin.orig/texk/tetex/texconfig 2005-12-13 21:32:02.000000000 +0000
-+++ tetex-bin/texk/tetex/texconfig 2005-12-13 21:32:18.000000000 +0000
+--- tetex-bin.orig/texk/tetex/texconfig 2005-12-15 17:16:59.000000000 +0000
++++ tetex-bin/texk/tetex/texconfig 2005-12-15 17:55:11.000000000 +0000
@@ -883,8 +883,8 @@
faq)
@@ -142,8 +142,8 @@
rc=1
Index: tetex-bin/texk/tetex/fmtutil
===================================================================
---- tetex-bin.orig/texk/tetex/fmtutil 2005-12-13 21:32:02.000000000 +0000
-+++ tetex-bin/texk/tetex/fmtutil 2005-12-13 21:32:18.000000000 +0000
+--- tetex-bin.orig/texk/tetex/fmtutil 2005-12-15 17:16:59.000000000 +0000
++++ tetex-bin/texk/tetex/fmtutil 2005-12-15 17:56:59.000000000 +0000
@@ -25,7 +25,13 @@
# --cnffile file set configfile for fmtutil
# --fmtdir directory set destination directory for format files
@@ -152,26 +152,21 @@
+###############################################################################
+#
+# Debian-specific options:
-+# --root-home Don't use TEXMFSYSVAR, TEXMFSYSCONFIG even when
++# --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,14 +82,44 @@
+@@ -76,14 +82,40 @@
# hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
-progname=fmtutil
--argv0=$0
-+case $RUNNING_AS_SYS in
-+ "") progname=fmtutil ;;
-+ *) progname=fmtutil-sys ;;
-+esac
-+
-+: ${argv0:=$0}
+ argv0=$0
+export argv0
++progname=`basename $argv0`
+
version=1105809354 # seconds since `00:00:00 1970-01-01 UTC'
# date '+%s' (with GNU date)
@@ -190,9 +185,9 @@
+ echo "generating formats in /root/.texmf-var." >&2
+ echo >&2
+ else
-+ if [ ! "$progname" = "fmtutil-sys" ]; then
++ if [ -z "$RUNNING_AS_SYS" ]; then
+ echo >&2
-+ echo "Warning: fmtutil is being run as root; fmtutil-sys should probably be" >&2
++ echo "Warning: $progname is being run as root; fmtutil-sys should probably be" >&2
+ echo "used instead. If this is done by a Debian package upon installation," >&2
+ echo "upgrade, or removal, please file a bug against that package." >&2
+ echo >&2
@@ -206,30 +201,43 @@
# cleanup()
# clean up the temp area and exit with proper exit status
###############################################################################
-@@ -885,5 +921,18 @@
- }
-
- main ${1+"$@"}
+@@ -92,8 +124,21 @@
+ rc=$?
+ $needsCleanup && test -n "$tmpdir" && test -d "$tmpdir" \
+ && { cd / && rm -rf "$tmpdir"; }
+
-+###############################################################################
-+# Debian hack, needed until depending packages have switched to
-+# calling fmtutil-sys
-+###############################################################################
-+if [ $SHOW_UID_WARNING ]; then
-+ echo >&2
-+ echo "Warning: fmtutil was run as root; fmtutil-sys was used instead." >&2
-+ echo "If this was done by a Debian package upon installation," >&2
-+ echo "upgrade, or removal, please file a bug against that package." >&2
-+ echo >&2
-+fi
++ #############################################################################
++ # Debian hack, needed until depending packages have switched to
++ # calling fmtutil-sys
++ #############################################################################
++ if [ $SHOW_UID_WARNING ]; then
++ echo >&2
++ echo "Warning: $progname was run as root; fmtutil-sys was used instead." >&2
++ echo "If this was done by a Debian package upon installation," >&2
++ echo "upgrade, or removal, please file a bug against that package." >&2
++ echo >&2
++ fi
+
- true
- cleanup
+ (exit $rc); exit $rc
+-}
++}
+
+ ###############################################################################
+ # setupTmpDir()
+@@ -435,7 +480,7 @@
+ --test|--dolinks|--force)
+ ;;
+ "") break;;
+- *) abort "$progname: unknown option \`$1'. Try $progname --help for help";;
++ *) abort "unknown option \`$1'. Try $progname --help for help";;
+ esac
+ do test $# -gt 0 && shift; done
+
Index: tetex-bin/texk/tetex/fmtutil-sys
===================================================================
---- tetex-bin.orig/texk/tetex/fmtutil-sys 2005-12-13 21:32:02.000000000 +0000
-+++ tetex-bin/texk/tetex/fmtutil-sys 2005-12-13 21:32:18.000000000 +0000
-@@ -23,6 +23,11 @@
+--- tetex-bin.orig/texk/tetex/fmtutil-sys 2005-12-15 17:16:59.000000000 +0000
++++ tetex-bin/texk/tetex/fmtutil-sys 2005-12-15 17:40:00.000000000 +0000
+@@ -23,6 +23,12 @@
TEXMFVAR="$v"
TEXMFCONFIG="$c"
@@ -238,15 +246,16 @@
+export TEXMFVAR TEXMFCONFIG RUNNING_AS_SYS
-exec fmtutil ${1+"$@"}
-+if [ "$argv0" = "mktexfmt" ]; then
-+ exec mktexfmt ${1+"$@"}
-+else
-+ exec fmtutil ${1+"$@"}
-+fi
++case $argv0 in
++ mktexfmt|*/mktexfmt)
++ exec mktexfmt ${1+"$@"} ;;
++ *)
++ exec fmtutil ${1+"$@"} ;;
++esac
Index: tetex-bin/texk/tetex/fmtutil.man
===================================================================
---- tetex-bin.orig/texk/tetex/fmtutil.man 2005-12-13 21:32:02.000000000 +0000
-+++ tetex-bin/texk/tetex/fmtutil.man 2005-12-13 21:32:18.000000000 +0000
+--- tetex-bin.orig/texk/tetex/fmtutil.man 2005-12-15 17:16:59.000000000 +0000
++++ tetex-bin/texk/tetex/fmtutil.man 2005-12-15 17:55:11.000000000 +0000
@@ -41,6 +41,14 @@
.IP "\fB--cnffile\fP \fIfile\fP"
specify the configuration
@@ -280,8 +289,8 @@
.PP
Index: tetex-bin/texk/web2c/fmtutil.in
===================================================================
---- tetex-bin.orig/texk/web2c/fmtutil.in 2005-12-13 21:32:02.000000000 +0000
-+++ tetex-bin/texk/web2c/fmtutil.in 2005-12-13 21:32:18.000000000 +0000
+--- tetex-bin.orig/texk/web2c/fmtutil.in 2005-12-15 17:16:59.000000000 +0000
++++ tetex-bin/texk/web2c/fmtutil.in 2005-12-15 17:55:11.000000000 +0000
@@ -55,7 +55,7 @@
# Change "amstex.ini -> bamstex.ini" and "- -> language.dat"
@@ -293,8 +302,8 @@
# if you want babel support in pdfamstex:
Index: tetex-bin/texk/web2c/cwebdir/cweb.1
===================================================================
---- tetex-bin.orig/texk/web2c/cwebdir/cweb.1 2005-12-13 21:32:02.000000000 +0000
-+++ tetex-bin/texk/web2c/cwebdir/cweb.1 2005-12-13 21:32:18.000000000 +0000
+--- tetex-bin.orig/texk/web2c/cwebdir/cweb.1 2005-12-15 17:16:59.000000000 +0000
++++ tetex-bin/texk/web2c/cwebdir/cweb.1 2005-12-15 17:55:11.000000000 +0000
@@ -100,19 +100,19 @@
.
.SH FILES
@@ -322,8 +331,8 @@
.SH "SEE ALSO"
Index: tetex-bin/texk/tetex/updmap.man
===================================================================
---- tetex-bin.orig/texk/tetex/updmap.man 2005-12-13 21:32:02.000000000 +0000
-+++ tetex-bin/texk/tetex/updmap.man 2005-12-13 21:32:18.000000000 +0000
+--- tetex-bin.orig/texk/tetex/updmap.man 2005-12-15 17:16:59.000000000 +0000
++++ tetex-bin/texk/tetex/updmap.man 2005-12-15 17:55:11.000000000 +0000
@@ -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
@@ -397,8 +406,8 @@
.PP
Index: tetex-bin/texk/tetex/updmap
===================================================================
---- tetex-bin.orig/texk/tetex/updmap 2005-12-13 21:32:18.000000000 +0000
-+++ tetex-bin/texk/tetex/updmap 2005-12-13 21:32:18.000000000 +0000
+--- tetex-bin.orig/texk/tetex/updmap 2005-12-15 17:55:11.000000000 +0000
++++ tetex-bin/texk/tetex/updmap 2005-12-15 17:54:30.000000000 +0000
@@ -15,6 +15,8 @@
# --nohash do not run texhash
# --nomkmap do not recreate map files
@@ -489,7 +498,27 @@
# psADOBE()
# transform fontnames from URW to Adobe
###############################################################################
-@@ -1274,7 +1318,8 @@
+@@ -757,6 +801,19 @@
+ rc=$?
+ $needsCleanup && test -n "$tmpdir" && test -d "$tmpdir" \
+ && { cd / && rm -rf "$tmpdir"; }
++
++ #############################################################################
++ # Debian hack, needed until depending packages have switched to
++ # calling updmap-sys
++ #############################################################################
++ if [ $SHOW_UID_WARNING ]; then
++ echo >&2
++ echo "Warning: updmap was run as root; updmap-sys was used instead." >&2
++ echo "If this was done by a Debian package upon installation," >&2
++ echo "upgrade, or removal, please file a bug against that package." >&2
++ echo >&2
++ fi
++
+ (exit $rc); exit $rc
+ }
+
+@@ -1274,7 +1331,8 @@
main()
{
# initialize global variables
@@ -499,28 +528,10 @@
cmd=
log=
-@@ -1375,4 +1420,17 @@
- }
-
- main ${1+"$@"}
-+
-+###############################################################################
-+# Debian hack, needed until depending packages have switched to
-+# calling updmap-sys
-+###############################################################################
-+if [ $SHOW_UID_WARNING ]; then
-+ echo >&2
-+ echo "Warning: updmap was run as root; updmap-sys was used instead." >&2
-+ echo "If this was done by a Debian package upon installation," >&2
-+ echo "upgrade, or removal, please file a bug against that package." >&2
-+ echo >&2
-+fi
-+
- cleanup
Index: tetex-bin/texk/tetex/updmap-sys
===================================================================
---- tetex-bin.orig/texk/tetex/updmap-sys 2005-12-13 21:32:02.000000000 +0000
-+++ tetex-bin/texk/tetex/updmap-sys 2005-12-13 21:32:18.000000000 +0000
+--- tetex-bin.orig/texk/tetex/updmap-sys 2005-12-15 17:16:59.000000000 +0000
++++ tetex-bin/texk/tetex/updmap-sys 2005-12-15 17:55:11.000000000 +0000
@@ -23,6 +23,7 @@
TEXMFVAR="$v"
@@ -532,8 +543,8 @@
exec updmap ${1+"$@"}
Index: tetex-bin/texk/tetex/texconfig-sys
===================================================================
---- tetex-bin.orig/texk/tetex/texconfig-sys 2005-12-13 21:32:02.000000000 +0000
-+++ tetex-bin/texk/tetex/texconfig-sys 2005-12-13 21:32:18.000000000 +0000
+--- tetex-bin.orig/texk/tetex/texconfig-sys 2005-12-15 17:16:59.000000000 +0000
++++ tetex-bin/texk/tetex/texconfig-sys 2005-12-15 17:55:11.000000000 +0000
@@ -23,6 +23,7 @@
TEXMFVAR="$v"
Modified: tetex-bin/trunk/debian/patches/patch-poppler
===================================================================
--- tetex-bin/trunk/debian/patches/patch-poppler 2005-12-15 13:00:38 UTC (rev 412)
+++ tetex-bin/trunk/debian/patches/patch-poppler 2005-12-15 18:12:50 UTC (rev 413)
@@ -1,7 +1,7 @@
Index: tetex-bin/texk/web2c/pdftexdir/depend.mk
===================================================================
---- tetex-bin.orig/texk/web2c/pdftexdir/depend.mk 2005-12-10 20:32:30.000000000 +0000
-+++ tetex-bin/texk/web2c/pdftexdir/depend.mk 2005-12-13 21:08:53.000000000 +0000
+--- tetex-bin.orig/texk/web2c/pdftexdir/depend.mk 2005-12-15 17:16:58.000000000 +0000
++++ tetex-bin/texk/web2c/pdftexdir/depend.mk 2005-12-15 17:55:11.000000000 +0000
@@ -1,54 +1,4 @@
-epdf.o: epdf.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
@@ -63,8 +63,8 @@
+pdftosrc.o: pdftosrc.cc
Index: tetex-bin/texk/web2c/pdftexdir/pdftoepdf.cc
===================================================================
---- tetex-bin.orig/texk/web2c/pdftexdir/pdftoepdf.cc 2005-12-10 20:32:30.000000000 +0000
-+++ tetex-bin/texk/web2c/pdftexdir/pdftoepdf.cc 2005-12-13 21:08:53.000000000 +0000
+--- tetex-bin.orig/texk/web2c/pdftexdir/pdftoepdf.cc 2005-12-15 17:16:58.000000000 +0000
++++ tetex-bin/texk/web2c/pdftexdir/pdftoepdf.cc 2005-12-15 17:55:11.000000000 +0000
@@ -26,22 +26,22 @@
#include <stdio.h>
#include <string.h>
@@ -142,8 +142,8 @@
pdftex_fail("pdf inclusion: invalid destination <%s>",
Index: tetex-bin/texk/web2c/pdftexdir/pdftosrc.cc
===================================================================
---- tetex-bin.orig/texk/web2c/pdftexdir/pdftosrc.cc 2005-12-10 20:32:30.000000000 +0000
-+++ tetex-bin/texk/web2c/pdftexdir/pdftosrc.cc 2005-12-13 21:08:53.000000000 +0000
+--- tetex-bin.orig/texk/web2c/pdftexdir/pdftosrc.cc 2005-12-15 17:16:58.000000000 +0000
++++ tetex-bin/texk/web2c/pdftexdir/pdftosrc.cc 2005-12-15 17:55:11.000000000 +0000
@@ -25,21 +25,21 @@
#include <stdio.h>
#include <string.h>
@@ -203,8 +203,8 @@
fprintf(stderr, "Invalid PDF file\n");
Index: tetex-bin/configure
===================================================================
---- tetex-bin.orig/configure 2005-12-13 21:08:52.000000000 +0000
-+++ tetex-bin/configure 2005-12-13 21:08:53.000000000 +0000
+--- tetex-bin.orig/configure 2005-12-15 17:55:11.000000000 +0000
++++ tetex-bin/configure 2005-12-15 17:55:11.000000000 +0000
@@ -3292,9 +3292,9 @@
# we need libxpdf for pdf[ex]tex
@@ -220,8 +220,8 @@
Index: tetex-bin/configure.in
===================================================================
---- tetex-bin.orig/configure.in 2005-12-10 20:32:59.000000000 +0000
-+++ tetex-bin/configure.in 2005-12-13 21:08:53.000000000 +0000
+--- tetex-bin.orig/configure.in 2005-12-15 17:16:58.000000000 +0000
++++ tetex-bin/configure.in 2005-12-15 17:55:11.000000000 +0000
@@ -145,9 +145,9 @@
# we need libxpdf for pdf[ex]tex
Modified: tetex-bin/trunk/debian/patches/series
===================================================================
--- tetex-bin/trunk/debian/patches/series 2005-12-15 13:00:38 UTC (rev 412)
+++ tetex-bin/trunk/debian/patches/series 2005-12-15 18:12:50 UTC (rev 413)
@@ -7,4 +7,4 @@
patch-src
patch-libtool
patch-deb
-patch-poppler
+patch-poppler -ppatch-deb
More information about the Pkg-tetex-commits
mailing list