[subversion-commit] SVN tetex-bin commit + diffs: r1277 - in
tetex-bin/trunk/debian: . patches
Frank Küster
frank at costa.debian.org
Thu May 4 09:21:58 UTC 2006
Author: frank
Date: 2006-05-04 09:21:57 +0000 (Thu, 04 May 2006)
New Revision: 1277
Modified:
tetex-bin/trunk/debian/changelog
tetex-bin/trunk/debian/patches/patch-deb
Log:
Change texconfig to use sensible-editor instead of hardcoded vi to
edit files, and document this in the manual page. Thanks to Vincent
L?\195?\182nngren <bice77 at malmo2.net> (closes: #365979) [frank]
Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog 2006-05-04 06:25:36 UTC (rev 1276)
+++ tetex-bin/trunk/debian/changelog 2006-05-04 09:21:57 UTC (rev 1277)
@@ -5,8 +5,11 @@
thanks (closes: #364505) [frank]
* Backports: Remove the now obsolete remark about not linking against
libpoppler from the lines added at the top of the changelog [frank]
+ * Change texconfig to use sensible-editor instead of hardcoded vi to
+ edit files, and document this in the manual page. Thanks to Vincent
+ Lönngren <bice77 at malmo2.net> (closes: #365979) [frank]
- -- Frank Küster <frank at debian.org> Thu, 27 Apr 2006 16:37:09 +0200
+ -- Frank Küster <frank at debian.org> Thu, 4 May 2006 11:19:50 +0200
tetex-bin (3.0-16) unstable; urgency=low
Modified: tetex-bin/trunk/debian/patches/patch-deb
===================================================================
--- tetex-bin/trunk/debian/patches/patch-deb 2006-05-04 06:25:36 UTC (rev 1276)
+++ tetex-bin/trunk/debian/patches/patch-deb 2006-05-04 09:21:57 UTC (rev 1277)
@@ -5,21 +5,21 @@
texk/tetex/fmtutil | 53 +++++++++++++++++++++++++++++++++++---
texk/tetex/fmtutil-sys | 10 +++++--
texk/tetex/fmtutil.man | 19 +++++++++++++
- texk/tetex/texconfig | 5 ++-
+ texk/tetex/texconfig | 7 ++---
texk/tetex/texconfig-sys | 3 +-
- texk/tetex/texconfig.man | 34 ++++++++++++++++++------
+ texk/tetex/texconfig.man | 46 +++++++++++++++++++++++++++------
texk/tetex/updmap | 62 +++++++++++++++++++++++++++++++++++++++++++--
texk/tetex/updmap-sys | 3 +-
texk/tetex/updmap.man | 33 ++++++++++++++++++-----
texk/web2c/cwebdir/cweb.1 | 10 +++----
texk/web2c/fmtutil.in | 2 -
texk/web2c/man/Makefile.in | 1
- 16 files changed, 214 insertions(+), 57 deletions(-)
+ 16 files changed, 227 insertions(+), 58 deletions(-)
-Index: tetex-bin/configure
+Index: tetex-bin-3.0/configure
===================================================================
---- tetex-bin.orig/configure 2006-03-29 10:00:02.000000000 +0100
-+++ tetex-bin/configure 2006-03-29 21:56:16.000000000 +0100
+--- tetex-bin-3.0.orig/configure 2006-05-04 11:07:55.000000000 +0200
++++ tetex-bin-3.0/configure 2006-05-04 11:08:03.000000000 +0200
@@ -4213,12 +4213,13 @@
@@ -40,10 +40,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 2006-03-29 10:00:02.000000000 +0100
-+++ tetex-bin/texk/kpathsea/mktexlsr 2006-03-29 21:56:16.000000000 +0100
+--- tetex-bin-3.0.orig/texk/kpathsea/mktexlsr 2006-05-04 11:07:55.000000000 +0200
++++ tetex-bin-3.0/texk/kpathsea/mktexlsr 2006-05-04 11:08:03.000000000 +0200
@@ -103,9 +103,9 @@
db_dir=`echo "$db_file" | sed 's%/[^/][^/]*$%%'` # can't rely on dirname
@@ -84,10 +84,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 2006-03-29 10:00:02.000000000 +0100
-+++ tetex-bin/texk/make/paths.mk 2006-03-29 21:56:16.000000000 +0100
+--- tetex-bin-3.0.orig/texk/make/paths.mk 2006-05-04 11:07:55.000000000 +0200
++++ tetex-bin-3.0/texk/make/paths.mk 2006-05-04 11:08:03.000000000 +0200
@@ -47,7 +47,7 @@
texmf = @texmfmain@
@@ -97,10 +97,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 2006-03-29 10:00:02.000000000 +0100
-+++ tetex-bin/texk/tetex/Makefile.in 2006-03-29 21:56:16.000000000 +0100
+--- tetex-bin-3.0.orig/texk/tetex/Makefile.in 2006-05-04 11:07:55.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/Makefile.in 2006-05-04 11:08:03.000000000 +0200
@@ -35,7 +35,7 @@
# Auxiliary files.
@@ -119,10 +119,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 2006-03-29 10:00:02.000000000 +0100
-+++ tetex-bin/texk/tetex/texconfig 2006-03-29 21:56:16.000000000 +0100
+--- tetex-bin-3.0.orig/texk/tetex/texconfig 2006-05-04 11:07:55.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/texconfig 2006-05-04 11:16:00.000000000 +0200
@@ -883,8 +883,8 @@
faq)
@@ -142,10 +142,19 @@
else
echo "$progname: setting up vardir failed. Reason: no permission to write file \`$tfc'" >&2
rc=1
-Index: tetex-bin/texk/tetex/fmtutil
+@@ -1067,7 +1068,7 @@
+ fi
+ ;;
+ esac
+- ${VISUAL-${EDITOR-vi}} "$tcBatchHFEdit"
++ ${VISUAL:-${EDITOR:-sensible-editor}} "$tcBatchHFEdit"
+ if cmp "$tcBatchHFEdit" "$tcBatchHFOrig" >/dev/null 2>&1; then
+ echo "$progname: configuration unchanged." >&2
+ else
+Index: tetex-bin-3.0/texk/tetex/fmtutil
===================================================================
---- tetex-bin.orig/texk/tetex/fmtutil 2006-03-29 10:00:02.000000000 +0100
-+++ tetex-bin/texk/tetex/fmtutil 2006-03-29 21:56:16.000000000 +0100
+--- tetex-bin-3.0.orig/texk/tetex/fmtutil 2006-05-04 11:07:55.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/fmtutil 2006-05-04 11:08:03.000000000 +0200
@@ -25,7 +25,13 @@
# --cnffile file set configfile for fmtutil
# --fmtdir directory set destination directory for format files
@@ -235,10 +244,10 @@
esac
do test $# -gt 0 && shift; done
-Index: tetex-bin/texk/tetex/fmtutil-sys
+Index: tetex-bin-3.0/texk/tetex/fmtutil-sys
===================================================================
---- tetex-bin.orig/texk/tetex/fmtutil-sys 2006-03-29 10:00:02.000000000 +0100
-+++ tetex-bin/texk/tetex/fmtutil-sys 2006-03-29 21:56:16.000000000 +0100
+--- tetex-bin-3.0.orig/texk/tetex/fmtutil-sys 2006-05-04 11:07:55.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/fmtutil-sys 2006-05-04 11:08:03.000000000 +0200
@@ -23,6 +23,12 @@
TEXMFVAR="$v"
@@ -254,10 +263,10 @@
+ *)
+ exec fmtutil ${1+"$@"} ;;
+esac
-Index: tetex-bin/texk/tetex/fmtutil.man
+Index: tetex-bin-3.0/texk/tetex/fmtutil.man
===================================================================
---- tetex-bin.orig/texk/tetex/fmtutil.man 2006-03-29 10:00:02.000000000 +0100
-+++ tetex-bin/texk/tetex/fmtutil.man 2006-03-29 21:56:16.000000000 +0100
+--- tetex-bin-3.0.orig/texk/tetex/fmtutil.man 2006-05-04 11:07:55.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/fmtutil.man 2006-05-04 11:08:03.000000000 +0200
@@ -1,4 +1,4 @@
-.TH "fmtutil" "8" "February 2005" "teTeX" "teTeX"
+.TH "fmtutil" "1" "February 2005" "teTeX" "teTeX"
@@ -295,10 +304,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 2006-03-29 10:00:02.000000000 +0100
-+++ tetex-bin/texk/web2c/fmtutil.in 2006-03-29 21:56:16.000000000 +0100
+--- tetex-bin-3.0.orig/texk/web2c/fmtutil.in 2006-05-04 11:07:55.000000000 +0200
++++ tetex-bin-3.0/texk/web2c/fmtutil.in 2006-05-04 11:08:03.000000000 +0200
@@ -55,7 +55,7 @@
# Change "amstex.ini -> bamstex.ini" and "- -> language.dat"
@@ -308,10 +317,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 2006-03-29 10:00:02.000000000 +0100
-+++ tetex-bin/texk/web2c/cwebdir/cweb.1 2006-03-29 21:56:16.000000000 +0100
+--- tetex-bin-3.0.orig/texk/web2c/cwebdir/cweb.1 2006-05-04 11:07:55.000000000 +0200
++++ tetex-bin-3.0/texk/web2c/cwebdir/cweb.1 2006-05-04 11:08:03.000000000 +0200
@@ -100,19 +100,19 @@
.
.SH FILES
@@ -337,10 +346,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 2006-03-29 10:00:02.000000000 +0100
-+++ tetex-bin/texk/tetex/updmap.man 2006-03-29 21:56:16.000000000 +0100
+--- tetex-bin-3.0.orig/texk/tetex/updmap.man 2006-05-04 11:07:55.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/updmap.man 2006-05-04 11:08:03.000000000 +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
@@ -412,10 +421,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 2006-03-29 21:56:15.000000000 +0100
-+++ tetex-bin/texk/tetex/updmap 2006-03-29 21:56:16.000000000 +0100
+--- tetex-bin-3.0.orig/texk/tetex/updmap 2006-05-04 11:08:03.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/updmap 2006-05-04 11:08:03.000000000 +0200
@@ -15,6 +15,8 @@
# --nohash do not run texhash
# --nomkmap do not recreate map files
@@ -536,10 +545,10 @@
cmd=
log=
-Index: tetex-bin/texk/tetex/updmap-sys
+Index: tetex-bin-3.0/texk/tetex/updmap-sys
===================================================================
---- tetex-bin.orig/texk/tetex/updmap-sys 2006-03-29 10:00:02.000000000 +0100
-+++ tetex-bin/texk/tetex/updmap-sys 2006-03-29 21:56:16.000000000 +0100
+--- tetex-bin-3.0.orig/texk/tetex/updmap-sys 2006-05-04 11:07:55.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/updmap-sys 2006-05-04 11:08:03.000000000 +0200
@@ -23,6 +23,7 @@
TEXMFVAR="$v"
@@ -549,10 +558,10 @@
+export TEXMFVAR TEXMFCONFIG RUNNING_AS_SYS
exec updmap ${1+"$@"}
-Index: tetex-bin/texk/tetex/texconfig-sys
+Index: tetex-bin-3.0/texk/tetex/texconfig-sys
===================================================================
---- tetex-bin.orig/texk/tetex/texconfig-sys 2006-03-29 10:00:02.000000000 +0100
-+++ tetex-bin/texk/tetex/texconfig-sys 2006-03-29 21:56:16.000000000 +0100
+--- tetex-bin-3.0.orig/texk/tetex/texconfig-sys 2006-05-04 11:07:55.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/texconfig-sys 2006-05-04 11:08:03.000000000 +0200
@@ -23,6 +23,7 @@
TEXMFVAR="$v"
@@ -562,10 +571,10 @@
+export TEXMFVAR TEXMFCONFIG RUNNING_AS_SYS
exec texconfig ${1+"$@"}
-Index: tetex-bin/texk/web2c/man/Makefile.in
+Index: tetex-bin-3.0/texk/web2c/man/Makefile.in
===================================================================
---- tetex-bin.orig/texk/web2c/man/Makefile.in 2006-03-29 10:00:02.000000000 +0100
-+++ tetex-bin/texk/web2c/man/Makefile.in 2006-03-29 21:56:16.000000000 +0100
+--- tetex-bin-3.0.orig/texk/web2c/man/Makefile.in 2006-05-04 11:07:55.000000000 +0200
++++ tetex-bin-3.0/texk/web2c/man/Makefile.in 2006-05-04 11:08:03.000000000 +0200
@@ -38,7 +38,6 @@
dvicopy.1 \
dvitomp.1 \
@@ -574,22 +583,23 @@
etex.1 \
gftodvi.1 \
gftopk.1 \
-Index: tetex-bin/texk/tetex/texconfig.man
+Index: tetex-bin-3.0/texk/tetex/texconfig.man
===================================================================
---- tetex-bin.orig/texk/tetex/texconfig.man 2006-03-29 10:00:02.000000000 +0100
-+++ tetex-bin/texk/tetex/texconfig.man 2006-03-29 21:56:34.000000000 +0100
-@@ -9,19 +9,37 @@
+--- tetex-bin-3.0.orig/texk/tetex/texconfig.man 2006-05-04 11:07:55.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/texconfig.man 2006-05-04 11:20:57.000000000 +0200
+@@ -6,22 +6,52 @@
+ .SH SYNOPSIS
+ .B texconfig
+ .LP
++.B texconfig
++[\fB commands\fR ...]
++.LP
.B texconfig-sys
.SH DESCRIPTION
.I texconfig
-allows to configure and maintain
+allows one to configure and maintain
- .I teTeX
--in an easy and convenient manner. It uses the
--.I dialog
--program to draw nice input boxes. After answering the dialoges, the
--appropriate files are changed automatically and all necessary
--steps are involved to apply the new settings.
++.I teTeX
+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
@@ -603,15 +613,29 @@
+program to communicate with the user, so must be run in a terminal.
+.PP
+For making system-wide changes, which will apply to all users of
-+.I teTeX
+ .I teTeX
+-in an easy and convenient manner. It uses the
+-.I dialog
+-program to draw nice input boxes. After answering the dialoges, the
+-appropriate files are changed automatically and all necessary
+-steps are involved to apply the new settings.
+(for example, default paper size and so on), run
+.I texconfig-sys
+instead. (You may need ot be root to do this.)
+.PP
+.I texconfig
-+also offers a non-interactive batch mode; run
-+.I texconfig help
-+to find out more about the available options.
++also offers a non-interactive batch mode which can be accessed with
++the following commands
++.SH OPTIONS
++To be written. Run
++.B texconfig help
++to get a list of commands.
++.SH ENVIRONMENT
++To let you change files,
++.B texconfig
++will open the editor specified in the VISUAL or EDITOR variables, or
++.B sensible-editor
++if both are unset.
.SH "SEE ALSO"
+.IR whiptail (1),
.IR dialog (1),
More information about the Pkg-tetex-commits
mailing list