[subversion-commit] SVN tetex commit + diffs: r287 - in
tetex-bin/trunk/debian: . patches
Frank Küster
frank at costa.debian.org
Wed Oct 19 20:09:08 UTC 2005
Author: frank
Date: 2005-10-19 20:09:07 +0000 (Wed, 19 Oct 2005)
New Revision: 287
Modified:
tetex-bin/trunk/debian/changelog
tetex-bin/trunk/debian/patches/patch-deb
tetex-bin/trunk/debian/postinst.in
tetex-bin/trunk/debian/rules
tetex-bin/trunk/debian/rules.in
Log:
* Changed $progname to $scriptname in fmtutil and fmtutil-sys. We
tested whether progname was correctly set to fmtutil-sys, but
$progname is also used as a command-line option to the TeX engines,
which propagates to the environment. Therefore when fmtutil
recursively called itself with -progname=jadetex, it failed (closes:
#334613). Many thanks to all who reported this bug and gave input,
special thanks that you used Followup-for and didn't open duplicates!
- also echo warnings in fmtutil/updmap to stdout, mktexfm expects the
name of the generated file on stdout, but it calls fmtutil to generate it
* Call debconf-updatepo in the clean target (closes: #334730) [frank]
* Let the clean target fail if the patches do not unapply cleanly,
i.e. they need refreshing [frank]
Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog 2005-10-19 20:07:08 UTC (rev 286)
+++ tetex-bin/trunk/debian/changelog 2005-10-19 20:09:07 UTC (rev 287)
@@ -1,10 +1,19 @@
tetex-bin (3.0-9.1) UNRELEASED; urgency=low
+ * Changed $progname to $scriptname in fmtutil and fmtutil-sys. We
+ tested whether progname was correctly set to fmtutil-sys, but
+ $progname is also used as a command-line option to the TeX engines,
+ which propagates to the environment. Therefore when fmtutil
+ recursively called itself with -progname=jadetex, it failed (closes:
+ #334613). Many thanks to all who reported this bug and gave input,
+ special thanks that you used Followup-for and didn't open duplicates!
* Really install changelog.Debian.experimental [frank]
- * Install the old md5sums for ucf-managed files (does not yet close: #334613)
- [frank]
+ * Install the old md5sums for ucf-managed files [frank]
+ * Call debconf-updatepo in the clean target (closes: #334730) [frank]
+ * Let the clean target fail if the patches do not unapply cleanly,
+ i.e. they need refreshing [frank]
- -- Frank Küster <frank at debian.org> Wed, 19 Oct 2005 15:22:04 +0200
+ -- Frank Küster <frank at debian.org> Wed, 19 Oct 2005 22:06:22 +0200
tetex-bin (3.0-9) unstable; urgency=low
Modified: tetex-bin/trunk/debian/patches/patch-deb
===================================================================
--- tetex-bin/trunk/debian/patches/patch-deb 2005-10-19 20:07:08 UTC (rev 286)
+++ tetex-bin/trunk/debian/patches/patch-deb 2005-10-19 20:09:07 UTC (rev 287)
@@ -13,10 +13,10 @@
texk/web2c/fmtutil.in | 2 +-
13 files changed, 144 insertions(+), 43 deletions(-)
-Index: tetex-bin/configure
+Index: tetex-bin-3.0/configure
===================================================================
---- tetex-bin.orig/configure 2005-10-17 22:36:19.731602000 +0200
-+++ tetex-bin/configure 2005-10-17 22:57:31.342874000 +0200
+--- tetex-bin-3.0.orig/configure 2005-10-19 21:41:58.683623831 +0200
++++ tetex-bin-3.0/configure 2005-10-19 21:47:38.083188720 +0200
@@ -4213,12 +4213,13 @@
@@ -37,10 +37,10 @@
# more customizations for standalone xdvik
if test -z "$xdvik_standalone"; then
-Index: tetex-bin/texk/kpathsea/mktexlsr
+Index: tetex-bin-3.0/texk/kpathsea/mktexlsr
===================================================================
---- 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
+--- tetex-bin-3.0.orig/texk/kpathsea/mktexlsr 2005-10-19 21:41:58.684623720 +0200
++++ tetex-bin-3.0/texk/kpathsea/mktexlsr 2005-10-19 21:47:38.085188499 +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/texk/make/paths.mk
+Index: tetex-bin-3.0/texk/make/paths.mk
===================================================================
---- 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
+--- tetex-bin-3.0.orig/texk/make/paths.mk 2005-10-19 21:41:58.684623720 +0200
++++ tetex-bin-3.0/texk/make/paths.mk 2005-10-19 21:47:38.085188499 +0200
@@ -47,7 +47,7 @@
texmf = @texmfmain@
@@ -94,10 +94,10 @@
# Regular input files.
texinputdir = $(texmf)/tex
-Index: tetex-bin/texk/tetex/Makefile.in
+Index: tetex-bin-3.0/texk/tetex/Makefile.in
===================================================================
---- 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
+--- tetex-bin-3.0.orig/texk/tetex/Makefile.in 2005-10-19 21:41:58.684623720 +0200
++++ tetex-bin-3.0/texk/tetex/Makefile.in 2005-10-19 21:47:38.086188389 +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/texk/tetex/texconfig
+Index: tetex-bin-3.0/texk/tetex/texconfig
===================================================================
---- 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
+--- tetex-bin-3.0.orig/texk/tetex/texconfig 2005-10-19 21:41:58.685623610 +0200
++++ tetex-bin-3.0/texk/tetex/texconfig 2005-10-19 21:47:38.088188168 +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/texk/tetex/fmtutil
+Index: tetex-bin-3.0/texk/tetex/fmtutil
===================================================================
---- 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
+--- tetex-bin-3.0.orig/texk/tetex/fmtutil 2005-10-19 21:41:58.685623610 +0200
++++ tetex-bin-3.0/texk/tetex/fmtutil 2005-10-19 21:50:06.159856151 +0200
@@ -25,7 +25,13 @@
# --cnffile file set configfile for fmtutil
# --fmtdir directory set destination directory for format files
@@ -163,7 +163,7 @@
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
-progname=fmtutil
-+: ${progname:=fmtutil}
++: ${scriptname:=fmtutil}
argv0=$0
version=1105809354 # seconds since `00:00:00 1970-01-01 UTC'
# date '+%s' (with GNU date)
@@ -177,17 +177,17 @@
+if [ `id -u` -eq 0 ]; then
+ if [ "$1" = "--root-home" ]; then
+ shift
-+ echo
-+ echo "$progname: Option --root-home given,"
-+ echo "generating formats in /root/.texmf-var."
-+ echo
++ echo >&2
++ echo "$scriptname: Option --root-home given," >&2
++ echo "generating formats in /root/.texmf-var." >&2
++ echo >&2
+ else
-+ if [ ! "$progname" = "fmtutil-sys" ]; then
-+ 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
++ if [ ! "$scriptname" = "fmtutil-sys" ]; then
++ echo >&2
++ echo "Warning: fmtutil 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
+ export SHOW_UID_WARNING=true
+ exec fmtutil-sys ${1+"$@"}
+ fi
@@ -198,6 +198,99 @@
# cleanup()
# clean up the temp area and exit with proper exit status
###############################################################################
+@@ -222,7 +252,7 @@
+ version()
+ {
+ cat <<eof
+-$progname version $version.
++$scriptname version $version.
+ eof
+ true
+ cleanup
+@@ -234,7 +264,7 @@
+ ###############################################################################
+ abort()
+ {
+- echo "$progname: $1." >&2
++ echo "$scriptname: $1." >&2
+ false # some systems need this to set nonzero $?
+ cleanup
+ }
+@@ -258,7 +288,7 @@
+ cat <<eof
+
+ ###############################################################################
+-$progname: Error! Not all formats have been built successfully.
++$scriptname: Error! Not all formats have been built successfully.
+ Visit the log files in directory
+ $destdir
+ for details.
+@@ -357,7 +387,7 @@
+ need_find_hyphenfile=false
+ cfgparam=
+ cfgmaint=
+- tmpdir=${TMP-/tmp}/$progname.$$
++ tmpdir=${TMP-/tmp}/$scriptname.$$
+ verboseFlag=true
+
+ # mktexfmtMode: if called as mktexfmt, set to true. Will echo the generated
+@@ -435,7 +465,7 @@
+ --test|--dolinks|--force)
+ ;;
+ "") break;;
+- *) abort "$progname: unknown option \`$1'. Try $progname --help for help";;
++ *) abort "$scriptname: unknown option \`$1'. Try $scriptname --help for help";;
+ esac
+ do test $# -gt 0 && shift; done
+
+@@ -455,7 +485,7 @@
+ test $? = 0 || cleanup
+ set x $co; shift
+ id=$1; cnf_file=$3; orig=$4
+- verboseMsg "$progname: initial config file is \`$orig'"
++ verboseMsg "$scriptname: initial config file is \`$orig'"
+ fi
+ else
+ if test -z "$cfgparam"; then
+@@ -491,9 +521,9 @@
+ ci=`tcfmgr --tmp $tmpdir --cmd ci --id $id`
+ if test $? = 0; then
+ if test -n "$ci"; then
+- verboseMsg "$progname: configuration file updated: \`$ci'"
++ verboseMsg "$scriptname: configuration file updated: \`$ci'"
+ else
+- verboseMsg "$progname: configuration file unchanged."
++ verboseMsg "$scriptname: configuration file unchanged."
+ fi
+ else
+ abort "failed to update configuration file."
+@@ -566,7 +596,7 @@
+
+ # We don't want user-interaction for the following "mv" command:
+ if mv "$i" "$destdir/$i" </dev/null; then
+- verboseMsg "$progname: $destdir/$i installed."
++ verboseMsg "$scriptname: $destdir/$i installed."
+ $mktexfmtMode && echo "$destdir/$i"
+ fi
+ mktexupd "$destdir" "$i"
+@@ -674,7 +704,7 @@
+ test -n "$pool" \
+ && poolfile=`(kpsewhich -progname=$engine $pool.pool) 2>/dev/null`
+ if test -n "$poolfile" && test -f "$poolfile"; then
+- verboseMsg "$progname: attempting to create localized format using pool=$pool and tcx=$tcx."
++ verboseMsg "$scriptname: attempting to create localized format using pool=$pool and tcx=$tcx."
+ cp "$poolfile" $engine.pool
+ test -n "$tcx" && tcxflag=-translate-file=$tcx
+ localpool=true
+@@ -690,7 +720,7 @@
+ esac
+
+ rm -f $fmtfile
+- verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
++ verboseMsg "$scriptname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
+
+ # run in a subshell to get a local effect of TEXPOOL manipulation:
+ (
@@ -885,5 +915,18 @@
}
@@ -208,32 +301,32 @@
+# 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
++ 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
+
true
cleanup
-Index: tetex-bin/texk/tetex/fmtutil-sys
+Index: tetex-bin-3.0/texk/tetex/fmtutil-sys
===================================================================
---- 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
+--- tetex-bin-3.0.orig/texk/tetex/fmtutil-sys 2005-10-19 21:41:58.685623610 +0200
++++ tetex-bin-3.0/texk/tetex/fmtutil-sys 2005-10-19 21:53:22.794167770 +0200
@@ -23,6 +23,7 @@
TEXMFVAR="$v"
TEXMFCONFIG="$c"
-export TEXMFVAR TEXMFCONFIG
-+progname=fmtutil-sys
-+export TEXMFVAR TEXMFCONFIG progname
++scriptname=fmtutil-sys
++export TEXMFVAR TEXMFCONFIG scriptname
exec fmtutil ${1+"$@"}
-Index: tetex-bin/texk/tetex/fmtutil.man
+Index: tetex-bin-3.0/texk/tetex/fmtutil.man
===================================================================
---- 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
+--- tetex-bin-3.0.orig/texk/tetex/fmtutil.man 2005-10-19 21:41:58.685623610 +0200
++++ tetex-bin-3.0/texk/tetex/fmtutil.man 2005-10-19 21:47:38.092187727 +0200
@@ -41,6 +41,14 @@
.IP "\fB--cnffile\fP \fIfile\fP"
specify the configuration
@@ -265,10 +358,10 @@
.PP
.SH "FILES"
.PP
-Index: tetex-bin/texk/web2c/fmtutil.in
+Index: tetex-bin-3.0/texk/web2c/fmtutil.in
===================================================================
---- 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
+--- tetex-bin-3.0.orig/texk/web2c/fmtutil.in 2005-10-19 21:41:58.694622618 +0200
++++ tetex-bin-3.0/texk/web2c/fmtutil.in 2005-10-19 21:47:38.118184860 +0200
@@ -55,7 +55,7 @@
# Change "amstex.ini -> bamstex.ini" and "- -> language.dat"
@@ -278,10 +371,10 @@
# Change "pdfamstex.ini -> pdfbamstex.ini" and "- -> language.dat"
# if you want babel support in pdfamstex:
-Index: tetex-bin/texk/web2c/cwebdir/cweb.1
+Index: tetex-bin-3.0/texk/web2c/cwebdir/cweb.1
===================================================================
---- 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
+--- tetex-bin-3.0.orig/texk/web2c/cwebdir/cweb.1 2005-10-19 21:41:58.694622618 +0200
++++ tetex-bin-3.0/texk/web2c/cwebdir/cweb.1 2005-10-19 21:47:38.119184749 +0200
@@ -100,19 +100,19 @@
.
.SH FILES
@@ -307,10 +400,10 @@
Directory for cweb "include" files.
.
.SH "SEE ALSO"
-Index: tetex-bin/texk/tetex/updmap.man
+Index: tetex-bin-3.0/texk/tetex/updmap.man
===================================================================
---- 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
+--- tetex-bin-3.0.orig/texk/tetex/updmap.man 2005-10-19 21:41:58.693622728 +0200
++++ tetex-bin-3.0/texk/tetex/updmap.man 2005-10-19 21:47:38.120184639 +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
@@ -382,10 +475,10 @@
\fBgsftopk\fP(1), \fBpdftex\fP(1), \fBps2pk\fP(1),
\fBtexhash\fP(1), \fBxdvi\fP(1)\&.
.PP
-Index: tetex-bin/texk/tetex/updmap
+Index: tetex-bin-3.0/texk/tetex/updmap
===================================================================
---- 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
+--- tetex-bin-3.0.orig/texk/tetex/updmap 2005-10-19 21:47:37.579244304 +0200
++++ tetex-bin-3.0/texk/tetex/updmap 2005-10-19 21:47:38.123184308 +0200
@@ -15,6 +15,8 @@
# --nohash do not run texhash
# --nomkmap do not recreate map files
@@ -412,17 +505,17 @@
+if [ `id -u` -eq 0 ]; then
+ if [ "$1" = "--root-home" ]; then
+ shift
-+ echo
-+ echo "$progname: Option --root-home given,"
-+ echo "generating font configuration in /root/.texmf-var."
-+ echo
++ echo >&2
++ echo "$progname: Option --root-home given," >&2
++ echo "generating font configuration in /root/.texmf-var." >&2
++ echo >&2
+ else
+ if [ ! "$progname" = "updmap-sys" ]; then
-+ echo
-+ 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
++ echo >&2
++ echo "Warning: updmap is being run as root; updmap-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
+ export SHOW_UID_WARNING=true
+ exec updmap-sys ${1+"$@"}
+ fi
@@ -494,18 +587,18 @@
+# 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
++ 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
+Index: tetex-bin-3.0/texk/tetex/updmap-sys
===================================================================
---- 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
+--- tetex-bin-3.0.orig/texk/tetex/updmap-sys 2005-10-19 21:41:58.694622618 +0200
++++ tetex-bin-3.0/texk/tetex/updmap-sys 2005-10-19 21:47:38.124184198 +0200
@@ -23,6 +23,7 @@
TEXMFVAR="$v"
Modified: tetex-bin/trunk/debian/postinst.in
===================================================================
--- tetex-bin/trunk/debian/postinst.in 2005-10-19 20:07:08 UTC (rev 286)
+++ tetex-bin/trunk/debian/postinst.in 2005-10-19 20:09:07 UTC (rev 287)
@@ -179,7 +179,9 @@
# now update the filename database
mktexlsr
- # now create the formats.
+ # now create the formats. We have to remove the old ones first, in case
+ # engines have changed
+ rm $TEXMFSYSVAR/web2c/*fmt
create_tetex_formats --all
# now create the font map files.
Modified: tetex-bin/trunk/debian/rules
===================================================================
--- tetex-bin/trunk/debian/rules 2005-10-19 20:07:08 UTC (rev 286)
+++ tetex-bin/trunk/debian/rules 2005-10-19 20:09:07 UTC (rev 287)
@@ -134,7 +134,8 @@
mkdir $(stampdir) || touch $(stampdir)
clean-patches:
- -quilt pop -a
+ # unapply patches, not giving an error when quilt says "No patch removed"
+ quilt pop -a || [ $$? = 2 ]
rm -f patch-stamp
patch-stamp:
@@ -163,8 +164,8 @@
rm -f debian/conffiles
rm -f $(EPERL_FILES)
rm -f debian/tetex-xwarn
+ debconf-updatepo
-
dh_clean
@@ -263,6 +264,7 @@
dh_installexamples
dh_installinfo
dh_installchangelogs -p$(package) -p$(sublib) ChangeLog
+ cp debian/changelog.Debian.experimental debian/$(package)/usr/share/doc/$(package)/
dh_installmime
dh_installmenu
dh_installcron
Modified: tetex-bin/trunk/debian/rules.in
===================================================================
--- tetex-bin/trunk/debian/rules.in 2005-10-19 20:07:08 UTC (rev 286)
+++ tetex-bin/trunk/debian/rules.in 2005-10-19 20:09:07 UTC (rev 287)
@@ -139,7 +139,8 @@
mkdir $(stampdir) || touch $(stampdir)
clean-patches:
- -quilt pop -a
+ # unapply patches, not giving an error when quilt says "No patch removed"
+ quilt pop -a || [ $$? = 2 ]
rm -f patch-stamp
patch-stamp:
@@ -168,8 +169,8 @@
rm -f debian/conffiles
rm -f $(EPERL_FILES)
rm -f debian/tetex-xwarn
+ debconf-updatepo
-
dh_clean
More information about the Pkg-tetex-commits
mailing list