[subversion-commit] SVN tetex commit + diffs: r119 - in
tetex-bin/trunk/debian: . patches
Frank Küster
frank at costa.debian.org
Fri Aug 5 08:23:24 UTC 2005
Author: frank
Date: 2005-08-05 08:23:23 +0000 (Fri, 05 Aug 2005)
New Revision: 119
Modified:
tetex-bin/trunk/debian/changelog
tetex-bin/trunk/debian/control
tetex-bin/trunk/debian/patches/patch-deb
tetex-bin/trunk/debian/patches/patch-deb.files
tetex-bin/trunk/debian/patches/patch-deb.old
Log:
* Removed build-dependency on obsolete libxaw-dev (closes: #241090)
* Make fmtutil recognize if it was called by fmtutil-sys (closes:
#320812).
* Add Suggests: rubber, as has been done in 2.0.2
Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog 2005-08-05 08:21:22 UTC (rev 118)
+++ tetex-bin/trunk/debian/changelog 2005-08-05 08:23:23 UTC (rev 119)
@@ -1,4 +1,4 @@
-tetex-bin (3.0-6) experimental; urgency=low
+tetex-bin (3.0-5.1) experimental; urgency=low
* Now Build-Depends on tex-common, and uses common.variables and
common.functions from there if possible. We still need the files in
@@ -11,8 +11,12 @@
* Update the section in debian/README.Debian that deals with manual
system-wide font installation by administrators (closes: #304294).
[frn]
+ * Removed build-dependency on obsolete libxaw-dev (closes: #241090)
+ * Make fmtutil recognize if it was called by fmtutil-sys (closes:
+ #320812).
+ * Add Suggests: rubber, as has been done in 2.0.2
- -- Frank Küster <frank at debian.org> Mon, 1 Aug 2005 18:55:27 +0200
+ -- Frank Küster <frank at debian.org> Fri, 5 Aug 2005 10:22:35 +0200
tetex-bin (3.0-5) experimental; urgency=low
Modified: tetex-bin/trunk/debian/control
===================================================================
--- tetex-bin/trunk/debian/control 2005-08-05 08:21:22 UTC (rev 118)
+++ tetex-bin/trunk/debian/control 2005-08-05 08:23:23 UTC (rev 119)
@@ -5,7 +5,7 @@
Uploaders: Julian Gilbey <jdg at debian.org>, C.M. Connelly <cmc at debian.org>, Atsuhito KOHDA <kohda at debian.org>, Frank Küster <frank at debian.org>
Standards-Version: 3.5.6.0
Build-Depends-Indep: tex-common
-Build-Depends: debhelper (>= 4.1.16), ed, libpng12-dev, zlib1g-dev, libxaw7-dev | libxaw-dev, flex, bison, tetex-base (>= 2.95), libt1-dev (>= 5.0.0-3), po-debconf, autotools-dev, libpaper-dev, texinfo, eperl, debiandoc-sgml
+Build-Depends: debhelper (>= 4.1.16), ed, libpng12-dev, zlib1g-dev, libxaw7-dev, flex, bison, tetex-base (>= 2.95), libt1-dev (>= 5.0.0-3), po-debconf, autotools-dev, libpaper-dev, texinfo, eperl, debiandoc-sgml
Package: tetex-bin
Priority: optional
@@ -15,7 +15,7 @@
Provides: tex, latex, dvips, dvipsk, xdvi, metafont, dvipdfm, cweb, texdoctk
Pre-Depends: dpkg (>= 1.6.8)
Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, tetex-base (>= 3.0-4), ed, debianutils (>= 1.13.1), mime-support, sed (>= 4.0.5), ucf (>= 1.02)
-Suggests: lpr, gs-gpl | gs-esp | gs-afpl, gv | postscript-viewer, xpdf-reader | pdf-viewer, tetex-extra, texinfo, texi2html, dvipng, chktex | lacheck
+Suggests: gs-gpl | gs-esp | gs-afpl, gv | postscript-viewer, xpdf-reader | pdf-viewer, tetex-extra, texinfo, texi2html, dvipng, chktex | lacheck, rubber
Recommends: dialog | whiptail, psutils, perl-tk, libxml-parser-perl
Description: The teTeX binary files
This is the binary part of teTeX. This package contains all the
Modified: tetex-bin/trunk/debian/patches/patch-deb
===================================================================
--- tetex-bin/trunk/debian/patches/patch-deb 2005-08-05 08:21:22 UTC (rev 118)
+++ tetex-bin/trunk/debian/patches/patch-deb 2005-08-05 08:23:23 UTC (rev 119)
@@ -1,5 +1,5 @@
---- configure.orig 2005-03-12 18:03:05.000000000 +0100
-+++ configure 2005-03-12 18:03:05.000000000 +0100
+--- configure.orig 2005-08-02 18:55:29.120999860 +0200
++++ configure 2005-08-02 18:55:29.252985294 +0200
@@ -4213,12 +4213,13 @@
@@ -20,8 +20,8 @@
# more customizations for standalone xdvik
if test -z "$xdvik_standalone"; then
---- texk/kpathsea/mktexlsr.orig 2005-03-12 18:03:05.000000000 +0100
-+++ texk/kpathsea/mktexlsr 2005-03-12 18:03:05.000000000 +0100
+--- texk/kpathsea/mktexlsr.orig 2005-08-02 18:55:29.125999308 +0200
++++ texk/kpathsea/mktexlsr 2005-08-02 18:55:29.254985073 +0200
@@ -103,9 +103,9 @@
db_dir=`echo "$db_file" | sed 's%/[^/][^/]*$%%'` # can't rely on dirname
@@ -62,8 +62,8 @@
done
tty -s && echo "$progname: Done." >&2
exit 0
---- texk/make/paths.mk.orig 2005-03-12 18:03:05.000000000 +0100
-+++ texk/make/paths.mk 2005-03-12 18:03:05.000000000 +0100
+--- texk/make/paths.mk.orig 2005-08-02 18:55:29.128998977 +0200
++++ texk/make/paths.mk 2005-08-02 18:55:29.254985073 +0200
@@ -47,7 +47,7 @@
texmf = @texmfmain@
@@ -73,8 +73,8 @@
# Regular input files.
texinputdir = $(texmf)/tex
---- texk/tetex/Makefile.in.orig 2005-03-12 18:03:05.000000000 +0100
-+++ texk/tetex/Makefile.in 2005-03-12 18:03:05.000000000 +0100
+--- texk/tetex/Makefile.in.orig 2005-08-02 18:55:29.131998646 +0200
++++ texk/tetex/Makefile.in 2005-08-02 18:55:29.255984963 +0200
@@ -35,7 +35,7 @@
# Auxiliary files.
@@ -93,8 +93,8 @@
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-03-12 18:03:05.000000000 +0100
-+++ texk/tetex/texconfig 2005-03-12 18:03:05.000000000 +0100
+--- texk/tetex/texconfig.orig 2005-08-02 18:55:29.135998205 +0200
++++ texk/tetex/texconfig 2005-08-02 18:55:29.260984411 +0200
@@ -883,8 +883,8 @@
faq)
@@ -114,8 +114,8 @@
else
echo "$progname: setting up vardir failed. Reason: no permission to write file \`$tfc'" >&2
rc=1
---- texk/tetex/fmtutil.orig 2005-03-12 18:03:05.000000000 +0100
-+++ texk/tetex/fmtutil 2005-03-12 18:05:46.000000000 +0100
+--- texk/tetex/fmtutil.orig 2005-08-02 18:55:29.138997874 +0200
++++ texk/tetex/fmtutil 2005-08-02 18:57:46.673838136 +0200
@@ -25,7 +25,13 @@
# --cnffile file set configfile for fmtutil
# --fmtdir directory set destination directory for format files
@@ -131,8 +131,16 @@
###############################################################################
# program history:
# Sa Jan 15 18:13:46 CET 2005 avoid multiple variable assignments in one statement
-@@ -83,6 +89,24 @@
+@@ -76,13 +82,33 @@
+ # 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
@@ -142,22 +150,35 @@
+ 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
++ 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
++ TEXMFVAR="`kpsewhich -var-value TEXMFSYSVAR`"
++ TEXMFCONFIG="`kpsewhich -var-value TEXMFSYSCONFIG`"
++ export TEXMFVAR TEXMFCONFIG
++ fi
+ fi
+fi
+
###############################################################################
# cleanup()
# clean up the temp area and exit with proper exit status
---- texk/tetex/fmtutil.man.orig 2005-03-12 18:03:05.000000000 +0100
-+++ texk/tetex/fmtutil.man 2005-03-12 18:03:05.000000000 +0100
+--- texk/tetex/fmtutil-sys.orig 2005-08-02 18:55:29.141997543 +0200
++++ texk/tetex/fmtutil-sys 2005-08-02 18:55:51.429537861 +0200
+@@ -23,6 +23,7 @@
+
+ TEXMFVAR="$v"
+ TEXMFCONFIG="$c"
+-export TEXMFVAR TEXMFCONFIG
++progname=fmtutil-sys
++export TEXMFVAR TEXMFCONFIG progname
+
+ exec fmtutil ${1+"$@"}
+--- texk/tetex/fmtutil.man.orig 2005-08-02 18:55:29.144997212 +0200
++++ texk/tetex/fmtutil.man 2005-08-02 18:55:29.262984191 +0200
@@ -53,6 +53,15 @@
(not implemented, just for compatibility)
.IP "\fB--test\fP"
@@ -174,8 +195,8 @@
.PP
.SH "FILES"
.PP
---- texk/web2c/fmtutil.in.orig 2005-03-12 18:03:05.000000000 +0100
-+++ texk/web2c/fmtutil.in 2005-03-12 18:03:05.000000000 +0100
+--- texk/web2c/fmtutil.in.orig 2005-08-02 18:55:29.147996881 +0200
++++ texk/web2c/fmtutil.in 2005-08-02 18:55:29.263984080 +0200
@@ -55,7 +55,7 @@
# Change "amstex.ini -> bamstex.ini" and "- -> language.dat"
@@ -185,8 +206,8 @@
# Change "pdfamstex.ini -> pdfbamstex.ini" and "- -> language.dat"
# if you want babel support in pdfamstex:
---- texk/web2c/cwebdir/cweb.1.orig 2005-03-12 18:03:05.000000000 +0100
-+++ texk/web2c/cwebdir/cweb.1 2005-03-12 18:03:05.000000000 +0100
+--- texk/web2c/cwebdir/cweb.1.orig 2005-08-02 18:55:29.150996550 +0200
++++ texk/web2c/cwebdir/cweb.1 2005-08-02 18:55:29.264983970 +0200
@@ -100,19 +100,19 @@
.
.SH FILES
@@ -212,8 +233,8 @@
Directory for cweb "include" files.
.
.SH "SEE ALSO"
---- texk/tetex/updmap.man.orig 2005-03-12 18:03:05.000000000 +0100
-+++ texk/tetex/updmap.man 2005-03-12 18:03:05.000000000 +0100
+--- texk/tetex/updmap.man.orig 2005-08-02 18:55:29.194991694 +0200
++++ texk/tetex/updmap.man 2005-08-02 18:55:29.265983860 +0200
@@ -98,10 +98,10 @@
\fBdvipdfmDownloadBase14\fP
.IP
Modified: tetex-bin/trunk/debian/patches/patch-deb.files
===================================================================
--- tetex-bin/trunk/debian/patches/patch-deb.files 2005-08-05 08:21:22 UTC (rev 118)
+++ tetex-bin/trunk/debian/patches/patch-deb.files 2005-08-05 08:23:23 UTC (rev 119)
@@ -4,6 +4,7 @@
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
Modified: tetex-bin/trunk/debian/patches/patch-deb.old
===================================================================
--- tetex-bin/trunk/debian/patches/patch-deb.old 2005-08-05 08:21:22 UTC (rev 118)
+++ tetex-bin/trunk/debian/patches/patch-deb.old 2005-08-05 08:23:23 UTC (rev 119)
@@ -1,5 +1,5 @@
---- configure.orig 2005-03-11 17:19:52.000000000 +0100
-+++ configure 2005-03-11 17:19:52.000000000 +0100
+--- configure.orig 2005-08-02 18:54:28.865653519 +0200
++++ configure 2005-08-02 18:54:28.956643478 +0200
@@ -4213,12 +4213,13 @@
@@ -20,8 +20,8 @@
# more customizations for standalone xdvik
if test -z "$xdvik_standalone"; then
---- texk/kpathsea/mktexlsr.orig 2005-03-11 17:19:52.000000000 +0100
-+++ texk/kpathsea/mktexlsr 2005-03-11 17:19:52.000000000 +0100
+--- 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
@@ -62,8 +62,8 @@
done
tty -s && echo "$progname: Done." >&2
exit 0
---- texk/make/paths.mk.orig 2005-03-11 17:19:52.000000000 +0100
-+++ texk/make/paths.mk 2005-03-11 17:19:52.000000000 +0100
+--- 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@
@@ -73,8 +73,8 @@
# Regular input files.
texinputdir = $(texmf)/tex
---- texk/tetex/Makefile.in.orig 2005-03-11 17:19:52.000000000 +0100
-+++ texk/tetex/Makefile.in 2005-03-11 17:19:52.000000000 +0100
+--- 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.
@@ -93,8 +93,8 @@
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-03-11 17:19:52.000000000 +0100
-+++ texk/tetex/texconfig 2005-03-11 17:19:52.000000000 +0100
+--- 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)
@@ -114,8 +114,8 @@
else
echo "$progname: setting up vardir failed. Reason: no permission to write file \`$tfc'" >&2
rc=1
---- texk/tetex/fmtutil.orig 2005-03-11 17:19:52.000000000 +0100
-+++ texk/tetex/fmtutil 2005-03-11 17:19:52.000000000 +0100
+--- 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
@@ -131,17 +131,30 @@
###############################################################################
# program history:
# Sa Jan 15 18:13:46 CET 2005 avoid multiple variable assignments in one statement
-@@ -83,6 +89,19 @@
+@@ -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` = 0 ]; then
++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
@@ -151,8 +164,8 @@
###############################################################################
# cleanup()
# clean up the temp area and exit with proper exit status
---- texk/tetex/fmtutil.man.orig 2005-03-11 17:19:52.000000000 +0100
-+++ texk/tetex/fmtutil.man 2005-03-11 17:23:22.000000000 +0100
+--- 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"
@@ -169,8 +182,8 @@
.PP
.SH "FILES"
.PP
---- texk/web2c/fmtutil.in.orig 2005-03-11 17:19:52.000000000 +0100
-+++ texk/web2c/fmtutil.in 2005-03-11 17:19:52.000000000 +0100
+--- 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"
@@ -180,8 +193,8 @@
# Change "pdfamstex.ini -> pdfbamstex.ini" and "- -> language.dat"
# if you want babel support in pdfamstex:
---- texk/web2c/cwebdir/cweb.1.orig 2005-03-11 17:19:52.000000000 +0100
-+++ texk/web2c/cwebdir/cweb.1 2005-03-11 17:19:52.000000000 +0100
+--- 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
@@ -207,8 +220,8 @@
Directory for cweb "include" files.
.
.SH "SEE ALSO"
---- texk/tetex/updmap.man.orig 2005-03-11 17:19:52.000000000 +0100
-+++ texk/tetex/updmap.man 2005-03-11 17:19:52.000000000 +0100
+--- 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
More information about the Pkg-tetex-commits
mailing list